Commit Graph

7 Commits

Author SHA1 Message Date
inikep
a6b942018d Merge remote-tracking branch 'refs/remotes/origin/dev' into dev070
# Conflicts:
#	.travis.yml
#	Makefile
#	lib/common/zstd_static.h
#	programs/Makefile
#	projects/VS2008/zstd/zstd.vcproj
#	projects/VS2008/zstdlib/zstdlib.vcproj
#	projects/cmake/lib/CMakeLists.txt
#	projects/cmake/programs/CMakeLists.txt
2016-06-01 00:07:09 +02:00
inikep
8243b27f44 cmake project: removed WORKAROUND_OUTDATED_CODE_STYLE 2016-05-31 17:19:05 +02:00
inikep
5d500b60e7 updated CMakeLists.txt 2016-05-31 13:39:36 +02:00
inikep
5bee32e349 cmake project works with MSYS 2016-05-31 13:36:14 +02:00
cyan
b880631aed Fixed visual projects
Signed-off-by: Yann Collet <yann.collet.73@gmail.com>
2016-05-30 18:28:29 +02:00
Yann Collet
0d348d46d8 fixed cmake
fixed playTests
2016-05-29 02:02:24 +02:00
inikep
33b8a893ed CMake project moved to projects 2016-05-24 17:44:14 +02:00