haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-04 21:36:57 +02:00
Code Issues Packages Projects Releases Wiki Activity
1134 commits 16 branches 56 tags 222 MiB
Commit graph

1134 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mário Feroldi 6aad67af23 fixed a tiny typo 2016-06-24 05:47:00 -03:00
Niels 0767290c26 off-by-one error in the documentation 2016-06-24 08:06:41 +02:00
Niels ca2bbdb15b clarified MSV version 2016-06-24 07:39:08 +02:00
Niels 25ccf7f908 Merge branch 'release/2.0.0' 2016-06-24 00:46:36 +02:00
Niels 1c719561b0 update of documentation links 2016-06-24 00:14:27 +02:00
Niels b3cf45c8f5 updated release information 2016-06-23 23:34:41 +02:00
Niels 6542ae5766 fixed re2c warnings 2016-06-23 22:49:48 +02:00
Niels 39a9cfcc12 updated README 2016-06-23 18:08:20 +02:00
Niels f86fe57c18 Merge branch 'feature/undo-number-roundtrip' into develop 2016-06-23 18:00:06 +02:00
Niels 04a80a8f60 Merge branch 'develop' into feature/undo-number-roundtrip 2016-06-23 05:57:41 +02:00
Niels 3497fab3b5 cleanup 2016-06-23 05:55:48 +02:00
Niels d14366c33e Merge branch 'feature/issue269' into develop 2016-06-23 00:05:01 +02:00
Niels 7cff6c8771 Merge branch 'develop' into feature/issue269 
# Conflicts:
#	README.md
 2016-06-23 00:04:55 +02:00
Niels 6f76c9237b overworked ChangeLog and README 2016-06-22 22:20:55 +02:00
Niels ecf84dddb1 test case for #269 2016-06-22 20:40:15 +02:00
Niels 59e67e768f fix for previous commit 2016-06-22 20:09:06 +02:00
Niels 3f97a5d5ad a conceptual quick fix for #269 2016-06-22 20:05:44 +02:00
Niels 15a314abea updated README 2016-06-19 22:38:54 +02:00
Niels 0865ec87d4 re-added GCC6 2016-06-19 22:20:02 +02:00
Niels 3fe654e827 fix for coverity 2016-06-19 22:12:56 +02:00
Niels 20e4b20528 fix SSL issue with coverity 2016-06-19 21:57:32 +02:00
Niels 90b46868b5 Merge branch 'develop' into feature/undo-number-roundtrip 2016-06-19 18:27:07 +02:00
Niels 8c48ef1f73 updated to Catch v1.5.6 2016-06-19 18:25:43 +02:00
Niels b47fdf88ee Merge branch 'develop' into feature/undo-number-roundtrip 2016-06-19 17:59:53 +02:00
Niels 4ff27b207e fixed two typos 2016-06-19 17:56:58 +02:00
Niels ad7a419a03 removed roundtripping of floats (#230) 2016-06-19 17:13:13 +02:00
Niels 4e31a0e852 minor doc changes 2016-06-19 16:17:53 +02:00
Niels 039565b9f5 trying codecov 2016-06-18 14:33:29 +02:00
Niels bb8c7b1f45 mentioning Homebrew's --HEAD parameter 2016-06-15 21:28:27 +02:00
Niels 1eced269e3 update after PR #266 2016-06-14 15:27:21 +02:00
Niels 9eb86e1e12 Merge pull request #266 from 06needhamt/Issue 
Fix Issue #265
 2016-06-14 15:24:49 +02:00
Tom Needham fb90388af5 Fix Issue #265 2016-06-14 09:59:50 +01:00
Niels 39213bf34e Merge branch 'feature/issue260' into develop 2016-06-14 08:28:36 +02:00
Niels 44b210aa77 Merge branch 'develop' into feature/issue260 2016-06-14 08:23:09 +02:00
Niels c744d59f2d adjusted README file to reality in Travis 2016-06-14 08:14:25 +02:00
Niels 947db6ffe3 added Xcode 8 beta 2016-06-14 08:02:29 +02:00
Niels 494cc15650 Merge branch 'develop' into feature/issue260 2016-06-07 12:13:03 +02:00
Niels 48f69f40e7 enough for today... 2016-06-07 12:04:57 +02:00
Niels 97648314a4 setting explicit path to compiler 2016-06-07 11:52:12 +02:00
Niels 439563eb04 export 2016-06-07 11:42:34 +02:00
Niels 19be324f87 ? 2016-06-07 11:38:56 +02:00
Niels 3f23e70598 another try 2016-06-07 11:36:03 +02:00
Niels 62f39c41ec another try 2016-06-07 11:29:37 +02:00
Niels c425dc9e04 trying to install clang 2016-06-07 11:25:00 +02:00
Niels a4058b88ec another test 2016-06-07 11:14:02 +02:00
Niels ff8f196ca3 a test 2016-06-07 11:13:15 +02:00
Niels 31b24dd5c1 adding more Clang versions 2016-06-07 11:02:45 +02:00
Niels cc5cad5b0b another try 2016-06-07 10:53:18 +02:00
Niels 1f04c0349a readded -lc++ 2016-06-07 10:03:18 +02:00
Niels a97c998791 removed -lc++ 2016-06-07 09:50:43 +02:00