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
							
						 
					 | 
					
						
						
						
						
							
						
						
							3ba765ea68
							
						
					 | 
					
						
						
							
							fixed menubar width issue
						
						
						
						
						
						
						
						the width of menubar is not changed when its parent window is resized 
						
						
					 | 
					
						2015-01-02 13:55:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cnjinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							aa12254844
							
						
					 | 
					
						
						
							
							Added listbox color scheme
						
						
						
						
						
						
					 | 
					
						2014-12-30 06:28:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cnjinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad7c36be3f
							
						
					 | 
					
						
						
							
							Renamed expr_color to color
						
						
						
						
						
						
					 | 
					
						2014-12-24 02:07:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cnjinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							42788db077
							
						
					 | 
					
						
						
							
							Breaking changes for expr_color
						
						
						
						
						
						
						
						expr_color is a temporary class name for new color type experiment. 
						
						
					 | 
					
						2014-12-17 11:20:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cnjinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d0a317bd45
							
						
					 | 
					
						
						
							
							first init of 0.9
						
						
						
						
						
						
					 | 
					
						2014-12-11 03:32:35 +08:00 | 
					
					
						
						
							
							
							
						
					 |