Merge branch 'master' of https://github.com/taocpp/json

d-frey · d-frey · commit 750603ad6199 · 2017-05-04T00:32:07.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,3 @@
 *~
-log
-.svn
 build
-manual
 private

-Original file line number
+Diff line change
@@ @@ -1,6 +1,3 @@ @@
 *~
 -log
 -.svn
 build
 -manual
 private