projects
/
platform
/
upstream
/
caffeonacl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ebd7bd7
5196926
)
Merge pull request #3286 from longjon/fix-py3-travis-boost
author
Jon Long
<jonlong@cs.berkeley.edu>
Thu, 5 Nov 2015 07:49:15 +0000
(23:49 -0800)
committer
Jon Long
<jonlong@cs.berkeley.edu>
Thu, 5 Nov 2015 07:49:15 +0000
(23:49 -0800)
[travis] fix boost/python3 conda conflict
Trivial merge