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

..

src

Resolve conflicts

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

CMakeLists.txt

cmake fixes for JSON adding

2012-07-31 06:44:40 +00:00

Makefile

added cmake support

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

Units_CE_vs90.vcproj

fixed text files

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

Units_vs71.vcproj

fixed text files

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

Units_vs80.vcproj

fixed text files

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

Units_vs90.vcproj

fixed text files

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

Units_vs100.vcxproj

fixed text files

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

Units_vs100.vcxproj.filters

fixed text files

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

Units_vs110.vcxproj

fixed text files

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

Units_vs110.vcxproj.filters

fixed text files

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

Units_x64_vs90.vcproj

fixed text files

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

Units_x64_vs100.vcxproj

fixed text files

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

Units_x64_vs100.vcxproj.filters

fixed text files

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

Units_x64_vs110.vcxproj

fixed text files

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

Units_x64_vs110.vcxproj.filters

fixed text files

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

Units.progen

fixed text files

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