mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-12-27 07:37:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,005 Commits 14 Branches 56 Tags 286 MiB
30211477b7
Commit Graph

3005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Niels
b508d1f1c4 fix proposal for #260 2016-06-06 18:50:39 +02:00
Niels
d4ff1bbaec Merge branch 'develop' into coverity_scan 2016-05-29 14:56:36 +02:00
Niels
04e1e7b586 cleanup 2016-05-29 14:56:08 +02:00
Niels
5666bd0e2d Merge branch 'develop' into coverity_scan 2016-05-29 14:06:54 +02:00
Niels
aa8aa3ba9f overworked coverity stuffy 2016-05-29 14:06:43 +02:00
Niels
03db7b0dbb Merge branch 'develop' into coverity_scan 2016-05-29 13:32:48 +02:00
Niels
6bdb883b5c ignore build errors for coverity-scan 2016-05-29 13:32:36 +02:00
Niels
53603500ed Merge branch 'develop' into coverity_scan 2016-05-29 13:06:40 +02:00
Niels
c0b2c6ea5d removing beta-xcode6.3 for now 2016-05-29 13:06:27 +02:00
Niels
97ea5ae403 Merge branch 'develop' into coverity_scan 2016-05-29 12:57:30 +02:00
Niels
6fed416125 fixed used compiler 2016-05-29 12:57:09 +02:00
Niels
b26582c0e9 another try for coverity-scan 2016-05-29 12:29:46 +02:00
Niels
1cc77a5fe5 another try for coverity-scan 2016-05-29 12:15:13 +02:00
Niels
91dfc723be added coverity_scan 2016-05-29 12:07:20 +02:00
Niels
7bdfde4493 added a note about different NDKs (see #219) 2016-05-28 16:06:41 +02:00
Niels
71a7746ccb removed a line 2016-05-25 21:55:03 +02:00
Niels
a3f432b3dd added hint to Homebrew 2016-05-18 22:23:35 +02:00
Niels
25d60b7bab Merge pull request #247 from robertmrk/feature/cmake-cleanup 
Define CMake/CTest tests
 2016-05-18 22:20:45 +02:00
Niels
837617122a fixed #246 2016-05-18 22:17:08 +02:00