projects
/
platform
/
upstream
/
jsoncpp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ce32274
4652f81
)
Merge pull request #303 from cdunn2001/appveyor-14.0
author
Christopher Dunn
<cdunn2001@gmail.com>
Sat, 11 Jul 2015 15:58:59 +0000
(10:58 -0500)
committer
Christopher Dunn
<cdunn2001@gmail.com>
Sat, 11 Jul 2015 15:58:59 +0000
(10:58 -0500)
fix appveyor 32-bit windows build
I've backed rebased under #297 because AppVeyor has been failing since there, and because that was not properly based on master anyway.
Trivial merge