cpp/charls
1
0
Fork 0
mirror of https://github.com/team-charls/charls synced 2025-03-28 21:03:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

#define problem (merge conflict)

Browse Source
This commit is contained in:
jdv_cp 2009-03-18 14:35:18 -07:00
parent e3432fd1b8
commit 5013f556c1
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
..svnbridge/.svnbridge
View File

@ -21,4 +21,5 @@ bin
CMakeFiles
xx
Debug
CMakeCache.txt
</Value></Property></Properties></ItemProperties>

6
test/..svnbridge/.svnbridge
View File

@ -10,4 +10,10 @@ mars
Release
*.user
CMakeFiles
</Value></Property><Property><Name>svn:ignore</Name><Value>Debug
mars
Release
*.user
CMakeFiles
CMakeCache.txt
</Value></Property></Properties></ItemProperties>

1
test/stdafx.h
View File

@ -12,7 +12,6 @@
#endif
#include <stdio.h>
#endif
#include <assert.h>
#define ASSERT(t) assert(t)