Get everything working after the rebase. I apologize, but it seems re…

…basing doesn't play nice with maintaining the commentary interleaving in the pull request.
maxtaco · Jan 24, 2012 · 2233f07 · 2233f07
1 parent dc81455
commit 2233f07
Show file tree

Hide file tree

Showing 8 changed files with 306 additions and 170 deletions.
diff --git a/lib/coffee-script/grammar.js b/lib/coffee-script/grammar.js
diff --git a/lib/coffee-script/lexer.js b/lib/coffee-script/lexer.js