15 Commits

Author	SHA1	Message	Date
omar	27b83a2cac	Merge branch 'master' into 2016-07-navigation	2017-05-01 12:38:33 +02:00
omar	f030087f8e	Comments to redirect people to OpenGL3 examples (#1116)	2017-04-26 18:27:10 +02:00
ocornut	fdc70456f4	Merge branch 'master' into 2016-07-navigation	2016-12-23 12:13:52 +01:00
ocornut	1396659b72	Examples: Speculative fix for OSX Makefile to make Travis happy (re #812)	2016-12-21 20:12:43 +01:00
ocornut	3028ccc25b	Merge remote-tracking branch 'origin' into 2016-07-navigation	2016-11-27 18:25:20 +01:00
ocornut	775ac24d45	Fixed overzealous GCC warnings (#883) + partly undo 8553bab241	2016-11-12 11:14:37 +01:00
ocornut	81eefb704b	Minor const fixes for overzealous warnings (#883)	2016-11-11 18:40:13 +01:00
ocornut	bdb34d1c11	Merge branch 'master' into 2016-07-navigation	2016-10-16 14:01:13 +02:00
ocornut	0d3f8807c7	Added a void* user_data parameter to Clipboard function handlers. (#875)	2016-10-15 11:36:43 +02:00
ocornut	ed279c0095	Merge remote-tracking branch 'origin' into 2016-07-navigation	2016-09-25 12:59:24 +02:00
ocornut	02399852fe	Examples: OpenGL2: Uploading font texture as RGBA32 to increase compatibility with users shaders for beginners (#824)	2016-09-10 17:43:17 +02:00
ocornut	bc57fd5d1d	Examples: OpenGL*: Savnig/restoring existing scissor rectangle for completeness (#807)	2016-09-05 23:39:52 +02:00
ocornut	2825eaa0be	Examples: Accessing ImVector fields directly, feel less stl-ey and fix renderer side assert when render list only contains a callback (#810)	2016-09-03 19:24:57 +02:00
ocornut	5ae71aa04a	Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)	2016-08-25 10:25:51 +02:00
ocornut	3c384c2f10	Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)	2016-08-25 10:18:09 +02:00