| 
							
							
								 Jinhao | fb7a16bc61 | use std::filesystem instead of std::experimental::filesystem | 2018-12-15 10:48:16 +08:00 |  | 
			
				
					| 
							
							
								 Jinhao | 7173e2449a | Merge branch 'hotfix-1.4.1' into develop | 2017-03-24 06:46:02 +08:00 |  | 
			
				
					| 
							
							
								 Jinhao | 24c1b292cc | fix compiler errors and warning | 2017-03-24 06:37:38 +08:00 |  | 
			
				
					| 
							
							
								 Jinhao | c233708841 | Merge branch 'hotfix-1.4.1' into develop | 2017-03-24 06:04:11 +08:00 |  | 
			
				
					| 
							
							
								 Jinhao | b1fe1ca412 | fix bug where window can't load icon with ico(#192) | 2017-03-24 05:30:47 +08:00 |  | 
			
				
					| 
							
							
								 qPCR4vir | 4450ff9678 | FIX crash in VS consistently using filesysten_ext | 2016-06-24 23:48:53 +02:00 |  | 
			
				
					| 
							
							
								 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 |  |