Jinhao 17556cae99 Merge branch 'feature-group' into develop ...

Conflicts:
	build/vc2013/nana.vcxproj
	build/vc2013/nana.vcxproj.filters

2015-07-12 11:31:06 +08:00

..

bakefile

Add back original makefiles and tweak bakefile

2015-03-22 16:56:52 -05:00

cmake

- Disable annoying VS warnings

2015-02-17 10:47:49 +01:00

codeblocks

minor changes

2015-04-10 01:18:32 +08:00

makefile

Add back original makefiles and tweak bakefile

2015-03-22 16:56:52 -05:00

makefile-bkl

Add back original makefiles and tweak bakefile

2015-03-22 16:56:52 -05:00

vc2013

Merge branch 'feature-group' into develop

2015-07-12 11:31:06 +08:00

vc2013-bkl/vc2013

Add back original makefiles and tweak bakefile

2015-03-22 16:56:52 -05:00

vc2015

Merge branch 'feature-group' into develop

2015-07-12 11:31:06 +08:00