[Pkg-javascript-commits] [SCM] JavaScript parser/mangler/compressor/beautifier library for NodeJS branch, master, updated. debian/1.0.4-1-62-g8889e8f

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 5221b3cd35488d75a5e8a85e05b4ef074b286d91
Merge: 2360cea0b75943e0cea988d4420ffc6ac75a4e60 a301c47b1e642c2ffbaa0ac630be344d3df2ded2
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Dec 9 22:52:39 2012 +0100

    Merge tag 'upstream/1.3.3'
    
    Upstream version 1.3.3
    
    Conflicts:
    	.gitignore

diff --combined .gitignore
index 381b2c5,83c3dac..4bd3c10
--- a/.gitignore
+++ b/.gitignore
@@@ -1,7 -1,6 +1,7 @@@
++/.pc
  .DS_Store
  .tmp*~
  *.local.*
  .pinf-*
- /.pc
  node_modules/
  npm-debug.log

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