6 Commits

Author SHA1 Message Date
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
Alex
2e69817ccf merge develop into master 2013-01-10 23:55:10 -06:00
Aleksandar Fabijanic
245f3e7568 VS 2012 mods to proj/sln files
VS 2012 modifications to project/solution files
added WinTestRunner dependency on CppUnit
2012-12-08 21:55:47 -06:00
Guenter Obiltschnig
2ddd48304d fixed text files 2012-11-11 13:56:24 +01:00
Guenter Obiltschnig
79eab26377 the great line endings cleanup 2012-11-11 09:57:01 +01:00
Aleksandar Fabijanic
fb275a9a30 Visual Studio 2012 projects and solutions files 2012-09-25 05:35:44 +00:00