Merge remote branch 'development/development'

This commit is contained in:
Kálmán Tarnay 2010-04-25 21:13:47 +02:00
commit 4c5caf0d9c
7 changed files with 141 additions and 69 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