[Pkg-javascript-commits] [SCM] JavaScript parser/mangler/compressor/beautifier library for NodeJS branch, master-experimental, updated. debian/1.3.4-1-12-ga67a0ae

[Jonas Smedegaard]

The following commit has been merged in the master-experimental branch:
commit 9c00e8beebd1137e2be10d021354e98d956c634e
Merge: 3fcdb2ece5a1dde8959041784556dd388a471678 88fee3465e69e5c7c57bbd6867341678757635a8
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Dec 9 23:43:36 2012 +0100

    Merge tag 'upstream/2.2.2' into master-experimental
    
    Upstream version 2.2.2
    
    Conflicts:
    	.gitignore

diff --combined .gitignore
index 4bd3c10,94fceeb..f92a4cf
--- a/.gitignore
+++ b/.gitignore
@@@ -1,7 -1,2 +1,3 @@@
 +/.pc
- .DS_Store
- .tmp*~
- *.local.*
- .pinf-*
+ tmp/
  node_modules/
- npm-debug.log

-- 
JavaScript parser/mangler/compressor/beautifier library for NodeJS