Browse files

Merge branch 'master' into asynctypes-685526

Conflicts:
	lib/gclitest/helpers.js
  • Loading branch information...
2 parents a5b0757 + bebc9a4 commit 8a026eb3a202c9f79124bb789c58c35319012ece @joewalker joewalker committed Feb 14, 2013
Showing with 8 additions and 0 deletions.
  1. +5 −0 .travis.yml
  2. +3 −0 package.json
View
5 .travis.yml
@@ -0,0 +1,5 @@
+
+language: node_js
+node_js:
+ - "0.8"
+
View
3 package.json
@@ -18,6 +18,9 @@
"type" : "git",
"url" : "http://github.com/joewalker/gcli.git"
},
+ "scripts": {
+ "test": "node gcli.js test"
+ },
"licenses": [
{ "type": "Apache-2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0" }
]

0 comments on commit 8a026eb

Please sign in to comment.