Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e5c88f121
							
						
					 | 
					
						
						
							
							code review
						
						
						
						
						
						
					 | 
					
						2015-07-24 00:44:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								qPCR4vir
							
						 
					 | 
					
						
						
						
						
							
						
						
							5711ce96f5
							
						
					 | 
					
						
						
							
							Merge branch 'hotfixes-1.0.2' into develop
						
						
						
						
						
						
					 | 
					
						2015-07-11 21:56:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							b1ed1f0452
							
						
					 | 
					
						
						
							
							Merge branch 'hotfixes-1.0.2' into develop
						
						
						
						
						
						
						
						Conflicts:
	include/nana/gui/detail/basic_window.hpp
	include/nana/gui/widgets/listbox.hpp
	source/gui/detail/linux_X11/bedrock.cpp
	source/gui/detail/win32/bedrock.cpp
	source/gui/detail/window_layout.cpp
	source/gui/detail/window_manager.cpp
	source/gui/widgets/listbox.cpp
	source/gui/widgets/toolbar.cpp 
						
						
					 | 
					
						2015-07-11 13:35:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							28413b7f25
							
						
					 | 
					
						
						
							
							explicit conversion from point/size to rectangle
						
						
						
						
						
						
					 | 
					
						2015-06-22 11:30:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								qPCR4vir
							
						 
					 | 
					
						
						
						
						
							
						
						
							7eece66df0
							
						
					 | 
					
						
						
							
							kainjow : "stoped" typo, should be "stopped"
						
						
						
						
						
						
					 | 
					
						2015-06-17 10:29:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								qPCR4vir
							
						 
					 | 
					
						
						
						
						
							
						
						
							3157f5f056
							
						
					 | 
					
						
						
							
							progressbar with stop()
						
						
						
						
						
						
					 | 
					
						2015-05-29 15:39:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							4385ac623d
							
						
					 | 
					
						
						
							
							add fps modifier for animation
						
						
						
						
						
						
					 | 
					
						2015-02-16 06:59:56 +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 | 
					
					
						
						
							
							
							
						
					 |