Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							ece696c3b5
							
						
					 | 
					
						
						
							
							update filesystem and remove fs_utility
						
						
						
						
						
						
					 | 
					
						2016-01-20 01:06:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							b35f293b9e
							
						
					 | 
					
						
						
							
							replace string parameter of image's constructor with filesystem::path
						
						
						
						
						
						
					 | 
					
						2015-11-30 00:58:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0ee42d184
							
						
					 | 
					
						
						
							
							merge beru's changes
						
						
						
						
						
						
					 | 
					
						2015-08-02 03:33:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d868f2377
							
						
					 | 
					
						
						
							
							Merge branch 'develop' of https://github.com/beru/nana into beru-develop
						
						
						
						
						
						
						
						Conflicts:
	source/gui/widgets/skeletons/text_editor.cpp
	source/gui/widgets/textbox.cpp
	source/paint/detail/image_bmp.hpp
	source/paint/detail/image_ico.hpp 
						
						
					 | 
					
						2015-08-01 22:08:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							e788c57512
							
						
					 | 
					
						
						
							
							add some missing files, refactor group
						
						
						
						
						
						
					 | 
					
						2015-07-13 04:57:01 +08:00 | 
					
					
						
						
							
							
							
						
					 |