Merge branch 'master' of git://github.com/kalmi/Trimage into development

This commit is contained in:
Kilian Valkhof 2010-04-27 11:27:51 +02:00
commit 2c2ac98b5d
3 changed files with 6 additions and 0 deletions

6
debian/changelog vendored
View file

@ -1,6 +1,12 @@
<<<<<<< HEAD
trimage (1.1.0b-0ubuntu1) jaunty; urgency=low
* use multiprocessing for images
=======
trimage (1.0.1b-0ubuntu1) jaunty; urgency=low
* use a threadpool for images
>>>>>>> development/development
* more robust file handling
* re-adding images now results in recompressing them
* compressing message now shows filename

0
src/trimage/trimage.py Normal file → Executable file
View file

0
trimage Normal file → Executable file
View file