10 Commits

Author	SHA1	Message	Date
Christopher Dunn	baefec773c	In case cmake is run in root-dir	2016-02-06 08:29:12 -06:00
Christopher Dunn	295e73ff3c	generate both version.h and version from CMakelists.txt ... This forces consistency, since they will be re-generated whenever a git operation alters CMakelists.txt. They are still in the repo because users might not actually run cmake.	2015-03-05 18:27:39 -06:00
Mattes D	5d79275a5b	Added MSVC+CMake generated files to .gitignore. ... pull #193	2015-03-02 23:50:14 -06:00
Christopher Dunn	4997dfb8af	1.1.1 <- 1.1.0 ... slight change to fail on a bad float	2015-01-16 15:09:54 -06:00
Christopher Dunn	9aa4681052	Revert "Merge branch 'no-version'" ... This reverts commit d9ced92d4040ee6c1475e96e18d715f99647e668, reversing changes made to d2fa664a12b478b3fd21f7659f3674c8520bf43b. Conflicts: include/json/version.h (keep)	2014-09-16 12:42:32 -07:00
Christopher Dunn	8ececfa538	stop ignoring version.h	2014-09-11 10:04:23 -07:00
findblar	a70b00750d	pull request #35 from finblarr:patch-1 ... fix build directory, within repo tree	2014-09-10 10:32:51 -07:00
Christopher Dunn	f3989977c0	rm generated version.h	2014-07-09 21:48:49 -07:00
Christopher Dunn	ba50403414	ignore doxygen stuff	2014-07-09 11:48:26 -07:00
Aaron Jacobs	39ba2dbea9	Added a .gitignore file, for ease of use with git-svn.	2011-05-24 23:05:56 +00:00