Permalink
Browse files

Merge branch 'master' of https://github.com/digger69/chosen into digg…

…er69-master

Conflicts:
	chosen/chosen.jquery.js
	chosen/chosen.jquery.min.js
	chosen/chosen.proto.js
	chosen/chosen.proto.min.js
  • Loading branch information...
2 parents c9294d5 + e400dc7 commit 3b3eca52491f8c00e988536b43df3501b15b6a51 @pfiller pfiller committed Jan 12, 2012
Showing with 287 additions and 361 deletions.
  1. +1 −1 README.md
  2. +140 −179 chosen/chosen.jquery.js
  3. +1 −1 chosen/chosen.jquery.min.js
  4. +140 −179 chosen/chosen.proto.js
  5. +1 −1 chosen/chosen.proto.min.js
  6. +2 −0 coffee/chosen.jquery.coffee
  7. +2 −0 coffee/chosen.proto.coffee
View
@@ -24,7 +24,7 @@ First, make sure you have the proper CoffeeScript / Cake set-up in place.
1. Install Coffeescript: the [CoffeeScript documentation](http://jashkenas.github.com/coffee-script/) provides easy-to-follow instructions.
2. Install UglifyJS: <code>npm -g install uglify-js</code>
-3. Verify that your $NODE_PATH is properly configured using <code>echo $NODE_PATH</code>
+3. Verify that your $NODE_PATH is properly configured using <code>echo $NODE_PATH</code>; e.g. /usr/lib/node_modules
Once you're configured, building the JavasScript from the command line is easy:
Oops, something went wrong.

0 comments on commit 3b3eca5

Please sign in to comment.