Alex 2e462e04d5 Resolve conflicts ...

All "confilcts" were actually diffs - not sure why git flew off the
handle.

2013-01-12 14:27:50 -06:00

..

data

renamed dir testfiles to data

2012-09-25 04:22:57 +00:00

src

Resolve conflicts

2013-01-12 14:27:50 -06:00

CMakeLists.txt

added cmake support

2012-06-26 12:37:02 +00:00

Makefile

unbundled build fixes

2013-01-05 00:04:09 -06:00

TestSuite_CE_vs90.vcproj

fixed text files

2012-11-11 13:56:24 +01:00

TestSuite_vs71.vcproj

fixed text files

2012-11-11 13:56:24 +01:00

TestSuite_vs80.vcproj

fixed text files

2012-11-11 13:56:24 +01:00

TestSuite_vs90.vcproj

fixed text files

2012-11-11 13:56:24 +01:00

TestSuite_vs100.vcxproj

fixed text files

2012-11-11 13:56:24 +01:00

TestSuite_vs100.vcxproj.filters

fixed text files

2012-11-11 13:56:24 +01:00

TestSuite_vs110.vcxproj

fixed text files

2012-11-11 13:56:24 +01:00

TestSuite_vs110.vcxproj.filters

fixed text files

2012-11-11 13:56:24 +01:00

TestSuite_x64_vs90.vcproj

fixed text files

2012-11-11 13:56:24 +01:00

TestSuite_x64_vs100.vcxproj

fixed text files

2012-11-11 13:56:24 +01:00

TestSuite_x64_vs100.vcxproj.filters

fixed text files

2012-11-11 13:56:24 +01:00

TestSuite_x64_vs110.vcxproj

fixed text files

2012-11-11 13:56:24 +01:00

TestSuite_x64_vs110.vcxproj.filters

fixed text files

2012-11-11 13:56:24 +01:00

TestSuite.progen

fixed text files

2012-11-11 13:56:24 +01:00