Keith Hammond
							
						 
					 | 
					
						
						
						
						
							
						
						
							bbd7d44b48
							
						
					 | 
					
						
						
							
							Merge branch 'hotfix-1.1.3' of https://github.com/RamblingMadMan/nana
						
						
						
						
						
						
					 | 
					
						2015-10-08 21:06:24 +13:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Keith Hammond
							
						 
					 | 
					
						
						
						
						
							
						
						
							e2ce6d81fd
							
						
					 | 
					
						
						
							
							Fixed the faulty CMakeLists.txt for linux/gcc builds that aren't biicode
						
						
						
						
						
						
					 | 
					
						2015-10-08 21:03:23 +13:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							75ee238f34
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/htzh/nana into htzh-master
						
						
						
						
						
						
					 | 
					
						2015-09-27 16:46:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Haitao Zhang
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c13cec4b7
							
						
					 | 
					
						
						
							
							Change cmake MinGW build default to include thread support.
						
						
						
						
						
						
					 | 
					
						2015-09-26 18:32:53 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert
							
						 
					 | 
					
						
						
						
						
							
						
						
							f21ceb0fac
							
						
					 | 
					
						
						
							
							Add VS2015 Linker fix also for Cmake
						
						
						
						
						
						
					 | 
					
						2015-09-14 12:37:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec098640fd
							
						
					 | 
					
						
						
							
							Fix Visual Studio 2015 codecvt linker errors
						
						
						
						
						
						
						
						Add missing defines 
						
						
					 | 
					
						2015-09-13 19:27:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rajko Đorđević
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0f6246ccc
							
						
					 | 
					
						
						
							
							Letting cmake to decide which standard to use, if compiler doesn't support c++14 it will fall back to c++11 as was before.
						
						
						
						
						
						
					 | 
					
						2015-05-10 12:01:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Gonzalez
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b97322d35
							
						
					 | 
					
						
						
							
							Detect Clang
						
						
						
						
						
						
					 | 
					
						2015-05-01 15:06:17 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d521e9829b
							
						
					 | 
					
						
						
							
							Merge branch 'develop' of https://github.com/qqiangwu/nana into qqiangwu-develop
						
						
						
						
						
						
						
						Conflicts:
	include/nana/deploy.hpp
	source/deploy.cpp 
						
						
					 | 
					
						2015-04-13 00:38:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								qqiangwu
							
						 
					 | 
					
						
						
						
						
							
						
						
							100283d43e
							
						
					 | 
					
						
						
							
							minor fix
						
						
						
						
						
						
					 | 
					
						2015-04-12 12:05:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								qqiangwu
							
						 
					 | 
					
						
						
						
						
							
						
						
							79ec3c927d
							
						
					 | 
					
						
						
							
							eliminate macro redefine error when used in biicode
						
						
						
						
						
						
					 | 
					
						2015-04-12 11:40:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								qqiangwu
							
						 
					 | 
					
						
						
						
						
							
						
						
							9c3f53eab8
							
						
					 | 
					
						
						
							
							modify readme and fix(maybe?) the curious thread support problem
						
						
						
						
						
						
					 | 
					
						2015-04-12 00:59:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								qqiangwu
							
						 
					 | 
					
						
						
						
						
							
						
						
							86d675fa85
							
						
					 | 
					
						
						
							
							fix mingw compilation error
						
						
						
						
						
						
					 | 
					
						2015-04-05 22:07:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							8eec17b227
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/roberthauck/nana into roberthauck-master
						
						
						
						
						
						
					 | 
					
						2015-02-17 23:45:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Hauck
							
						 
					 | 
					
						
						
						
						
							
						
						
							b755c24804
							
						
					 | 
					
						
						
							
							- Disable annoying VS warnings
						
						
						
						
						
						
						
						- Option to enable multiprocessor build on VS
- Move all options to CMake:
   - Unicode
   - Platform specs 
						
						
					 | 
					
						2015-02-17 10:47:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cnjinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							c417f15b03
							
						
					 | 
					
						
						
							
							add contributor information
						
						
						
						
						
						
					 | 
					
						2015-02-12 02:45:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Hauck
							
						 
					 | 
					
						
						
						
						
							
						
						
							0fa61b0c95
							
						
					 | 
					
						
						
							
							make libpng only selectable when using png
						
						
						
						
						
						
					 | 
					
						2015-02-11 14:02:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Hauck
							
						 
					 | 
					
						
						
						
						
							
						
						
							0464e8e5d7
							
						
					 | 
					
						
						
							
							missing include
						
						
						
						
						
						
					 | 
					
						2015-02-11 13:57:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Hauck
							
						 
					 | 
					
						
						
						
						
							
						
						
							68caee5c2b
							
						
					 | 
					
						
						
							
							fix for linux build (Fedora 21)
						
						
						
						
						
						
					 | 
					
						2015-02-11 13:48:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Hauck
							
						 
					 | 
					
						
						
						
						
							
						
						
							5afe02cdd4
							
						
					 | 
					
						
						
							
							wrong defines
						
						
						
						
						
						
					 | 
					
						2015-02-11 13:32:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Hauck
							
						 
					 | 
					
						
						
						
						
							
						
						
							73a5352796
							
						
					 | 
					
						
						
							
							fix for libpng
						
						
						
						
						
						
					 | 
					
						2015-02-11 13:23:01 +01:00 | 
					
					
						
						
							
							
							
						
					 |