ocornut
							
						 
					 | 
					
						
						
							
						
						fd44b9440b
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
						
						
						
						
						
						
						
						Conflicts:
	imgui.cpp 
						
						
					 | 
					
						2015-07-10 21:45:25 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						5ab23ab1c0
					 | 
					
						
						
							
							Allegro 5 example: removed public domain mark, MIT as the rest, with @bggd approval
						
						
						
						
						
						
					 | 
					
						2015-07-08 17:25:56 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						2f574ef952
					 | 
					
						
						
							
							Allegro 5 example: converted for indexed rendering.
						
						
						
						
						
						
					 | 
					
						2015-07-08 12:55:40 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						bbaaab7537
					 | 
					
						
						
							
							Allegro 5 example: fixed uv coordinate of non-default texture.
						
						
						
						
						
						
					 | 
					
						2015-07-08 12:41:09 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						4d2d0ce5cd
					 | 
					
						
						
							
							Allegro 5 example: handling of hardware and software mouse cursor rendering.
						
						
						
						
						
						
					 | 
					
						2015-07-08 12:16:50 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						8db229b96f
					 | 
					
						
						
							
							Allegro 5 example: fixed key modifiers, keyboard input, clipping, added pagedown/pageup.
						
						
						
						
						
						
					 | 
					
						2015-07-08 12:04:13 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						c58d61dfd1
					 | 
					
						
						
							
							Allegro 5 example: formatting, match other example structure, fixed mouse buttons.
						
						
						
						
						
						
					 | 
					
						2015-07-08 11:53:30 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						489e28ec11
					 | 
					
						
						
							
							Allegro 5 example: main.cpp matches other examples. added window title.
						
						
						
						
						
						
					 | 
					
						2015-07-08 11:46:18 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						19e3c1506f
					 | 
					
						
						
							
							Allegro5 example: added example from https://github.com/bggd/a5imgui_example
						
						
						
						
						
						
					 | 
					
						2015-07-08 11:34:36 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |