| 
							
							
								 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 |  |