Permalink
Browse files

Merge branch 'master' into benchmark

  • Loading branch information...
2 parents 4fe3af6 + 6cde8dc commit e7ccc6e911b2bcb852e33e68c4cd92d405b7ca77 @derek committed Mar 20, 2013
Showing with 4 additions and 7 deletions.
  1. +3 −6 .travis.yml
  2. +1 −1 lib/cmds/build.js
View
@@ -1,8 +1,5 @@
language: node_js
node_js:
- - 0.6
- - 0.8
- - 0.9
-branches:
- only:
- - master
+ - "0.8"
+ - "0.9"
+ - "0.10"
View
@@ -174,7 +174,7 @@ mods = {
'--loud for more info',
'--ant to use ant instead of shifter',
'--test execute tests after the build is complete',
- 'Any other parameters will be passed down to shifter under the hood'
+ 'Any other parameters will be passed down to shifter under the hood (e.g. --watch)'
];
}
};

0 comments on commit e7ccc6e

Please sign in to comment.