cnjinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							4bc00f3517
							
						
					 | 
					
						
						
							
							Merge branch 'hotfixes' into develop
						
						
						
						
						
						
						
						Conflicts:
	include/nana/detail/linux_X11/platform_spec.hpp
	source/detail/linux_X11/platform_spec.cpp
	source/paint/detail/native_paint_interface.cpp 
						
						
					 | 
					
						2015-01-02 23:54:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cnjinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							977a6c0e86
							
						
					 | 
					
						
						
							
							A fix for non-English input issue.
						
						
						
						
						
						
						
						Extended ASCII characters input issue, window title bar issue. 
						
						
					 | 
					
						2014-12-23 17:09:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cnjinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							e64b6ec2b2
							
						
					 | 
					
						
						
							
							Breaking changes for expr_color
						
						
						
						
						
						
						
						Removed the typedef-name nana::color_t 
						
						
					 | 
					
						2014-12-18 13:08:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cnjinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							74c09eb9b3
							
						
					 | 
					
						
						
							
							Defined a new color class
						
						
						
						
						
						
						
						The new color class is temporarily named expr_color for experiment. 
						
						
					 | 
					
						2014-12-14 10:15:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cnjinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d0a317bd45
							
						
					 | 
					
						
						
							
							first init of 0.9
						
						
						
						
						
						
					 | 
					
						2014-12-11 03:32:35 +08:00 | 
					
					
						
						
							
							
							
						
					 |