Commit Graph

314 Commits

Author SHA1 Message Date
ocornut b1987d697f Trim trailing whitespace (#305) 2015-08-24 13:50:18 +02:00
omar 9a97ef673e Merge pull request #296 from tpoechtrager/master
Fixes for compiling Windows target with non-MSVC compiler.
2015-08-09 10:49:06 -06:00
ocornut 6a90ac2094 Tentative GCC/Clang warning fixes with unused functions (cf #296) 2015-08-09 10:45:58 -06:00
Thomas Pöchtrager 3604aecf8f Minor Windows adjustments 2015-08-09 17:24:10 +02:00
ocornut 14822609bd Version number 1.45 WIP 2015-08-08 12:18:37 -06:00
ocornut a99ba42a39 Version number 1.44 2015-08-08 07:57:29 -06:00
ocornut 20cc65788d Build fix for Orbis / PS4 2015-08-07 21:52:57 -06:00
ocornut 815d1d9be4 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
2015-08-03 08:12:57 -06:00
ocornut 2d8c134747 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
2015-08-01 07:26:09 -06:00
ocornut abf823c6f6 Tidying up 2015-07-30 22:49:10 -06:00
ocornut a7e5945206 Merge 2015-07-30 21:37:59 -06:00
ocornut 709c4c3168 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
2015-07-30 20:42:12 -06:00
ocornut e32f0931e8 Missing includes for imgui_draw.cpp (#219) 2015-07-21 17:08:20 -06:00
ocornut dace68b6fd Big cleanup, split imgui.cpp into imgui_demo.cpp,imgui_draw.cpp imgui_internal.h (#219) 2015-07-21 17:00:28 -06:00