1
0
mirror of https://github.com/nlohmann/json synced 2024-11-29 23:21:04 +00:00
Commit Graph

919 Commits

Author SHA1 Message Date
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
8c48ef1f73 updated to Catch v1.5.6 2016-06-19 18:25:43 +02:00
Niels
4ff27b207e fixed two typos 2016-06-19 17:56:58 +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
Niels
6d19bd1108 Revert "another try"
This reverts commit f63317dce3.
2016-06-07 09:49:11 +02:00
Niels
f63317dce3 another try 2016-06-07 09:34:46 +02:00
Niels
32cc6fefcc another try 2016-06-07 09:12:53 +02:00
Niels
fbbdcb19bc another try 2016-06-07 09:01:49 +02:00
Niels
dd10c89a3e another try 2016-06-07 08:53:36 +02:00
Niels
dd542aae7d another try 2016-06-07 08:40:25 +02:00
Niels
761880f5b7 CPATH does not work... 2016-06-07 08:32:56 +02:00
Niels
1826d12a22 added CPATH 2016-06-07 08:28:50 +02:00
Niels
dfc39b95ab clang does not work with travis right now 2016-06-07 07:54:00 +02:00
Niels
32f6682177 another try 2016-06-07 07:25:11 +02:00
Niels
f4ae8f8e2e another try 2016-06-07 07:21:17 +02:00
Niels
e772f06f0d another try 2016-06-07 07:14:54 +02:00
Niels
5173c16222 another try 2016-06-07 07:07:42 +02:00
Niels
744bae7fc4 trying to fix Travis 2016-06-07 07:00:31 +02:00
Niels
9e2dfd19e8 minor cleanup 2016-06-07 00:20:53 +02:00