Merge branch 'master' into zoom_filter
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 16 Jun 2011 12:48:39 +0000 (14:48 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 16 Jun 2011 12:48:39 +0000 (14:48 +0200)
commit5a2903cdfd78fad9b3e5f8ebcd473356697650ef
treec144d47f6ac081de3515d0a2d1e07b6c49e7b1db
parentd2beb20fde0f1d51e11a71ab7fac13a4da91474c
parent4b7d3f1086745b31b3532862508fb3ad44420058
Merge branch 'master' into zoom_filter

Conflicts:
src/filter_zoom.cpp
src/filter_zoom.cpp