Revert "Merge branch 'no-version'"

This reverts commit d9ced92d40, reversing
changes made to d2fa664a12.

Conflicts:
	include/json/version.h (keep)
This commit is contained in:
Christopher Dunn
2014-09-16 12:26:50 -07:00
parent af77b5b594
commit 9aa4681052
3 changed files with 34 additions and 0 deletions

1
.gitignore vendored
View File

@@ -10,3 +10,4 @@
/libs/
/doc/doxyfile
/dist/
/include/json/version.h