Merge branch 'master' into O2

This commit is contained in:
Tom Atkinson
2015-08-21 11:05:05 +02:00
+12 -1
View File
@@ -1,5 +1,16 @@
language: node_js
node_js:
- "iojs-v3"
- "iojs-v2"
- "iojs-v1"
- "0.12"
- "0.10"
- "iojs"
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-4.9
- g++-4.9
before_install:
- export CC="gcc-4.9" CXX="g++-4.9"