6 Commits

Author	SHA1	Message	Date
Alexander Bock	97d97a8a16	Merge branch 'develop' into features/imgui	2015-02-17 15:11:25 +01:00
Alexander Bock	a6ebddb8eb	Updated copyright header in all files	2015-02-17 14:20:03 +01:00
Alexander Bock	f752221772	Added Vec4Property to imgui	2015-01-21 15:12:54 +01:00
Alexander Bock	7007353687	More work on GUI components	2014-12-19 13:17:42 +01:00
Alexander Bock	cd012548af	Intermediate work on making imgui into components	2014-12-18 19:15:57 +01:00
Alexander Bock	55a3c43db4	Move imgui file to its own folder	2014-12-18 17:21:20 +01:00