Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/digger69/chosen into digg…
Browse files Browse the repository at this point in the history 
…er69-master

Conflicts:
	chosen/chosen.jquery.js
	chosen/chosen.jquery.min.js
	chosen/chosen.proto.js
	chosen/chosen.proto.min.js
  • Loading branch information
Patrick Filler committed Jan 12, 2012
2 parents c9294d5 + e400dc7 commit 3b3eca5
Show file tree
Hide file tree
Showing 7 changed files with 287 additions and 361 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -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. 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> 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: Once you're configured, building the JavasScript from the command line is easy:


Expand Down
Loading

0 comments on commit 3b3eca5

Please sign in to comment.