omar
							
						 
					 | 
					
						
						
							
						
						b89202824e
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	examples/imgui_impl_sdl.cpp 
						
						
					 | 
					
						2019-04-15 16:03:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						35cbf9c052
					 | 
					
						
						
							
							Examples: Visual Studio: Updated default platform toolset+sdk in vcproj files from v100+sdk7 (vs2010) to v110+sdk8 (vs2012). This is mostly so we can remove reliance on DXSDK_DIR for the DX10/DX11 example, which if existing and when switching to recent SDK ends up conflicting and creating warnings.
						
						
						
						
						
						
					 | 
					
						2019-04-15 15:48:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						87ded34f9f
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui_widgets.cpp 
						
						
					 | 
					
						2019-02-22 12:29:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						d0c98bf880
					 | 
					
						
						
							
							Examples: VS: Made project paths independant of SolutionDir so they can be built aside from the solution.
						
						
						
						
						
						
					 | 
					
						2019-02-19 20:13:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						89a530b442
					 | 
					
						
						
							
							Somehow VS keeps modifying this GUID so I am going to playing along with it.
						
						
						
						
						
						
					 | 
					
						2018-12-03 11:44:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						e312363007
					 | 
					
						
						
							
							Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)
						
						
						
						
						
						
					 | 
					
						2018-08-30 19:00:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						01586d33f3
					 | 
					
						
						
							
							Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)
						
						
						
						
						
						
					 | 
					
						2018-08-30 14:29:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						5a13e4dcde
					 | 
					
						
						
							
							Examples: Renamed imgui_impl_sdl2.cpp to imgui_impl_sdl.cpp (#1870) + changelog bits
						
						
						
						
						
						
					 | 
					
						2018-06-10 15:58:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						8d58fbb5ed
					 | 
					
						
						
							
							Examples: Renamed example folders. (#1870)
						
						
						
						
						
						
					 | 
					
						2018-06-10 15:42:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |