Merge commit 'b1e548b96a0a7fbe37ca269ca56fc97444acb2f1' as 'deps/ox'

2017-05-09 01:06:23 -05:00
parent 8778ce8764 b1e548b96a
commit bb5939a663
60 changed files with 5130 additions and 0 deletions
--- a/deps/ox/.travis.yml
+++ b/deps/ox/.travis.yml
@ -0,0 +1,11 @@
+language: cpp
+sudo: false
+dist: trusty
+compiler:
+   - clang
+   - gcc
+addons:
+    apt:
+        packages:
+            - cmake
+script: ./scripts/cibuild