Merge commit 'origin/master' 0.1Beta1
authorMehrdad Momeny <mehrdad.momeny@gmail.com>
Tue, 3 Mar 2009 12:23:58 +0000 (15:53 +0330)
committerMehrdad Momeny <mehrdad.momeny@gmail.com>
Tue, 3 Mar 2009 12:23:58 +0000 (15:53 +0330)
commit276f39148e789dc9430cd22b104a0d9380ced087
tree952c9b1c19a791494df48f59651603bdf6f50616
parent18bc6296a7b15c353d9eab7162ffb5e20837e5e8
parent20d20dc6ed439757bfdc1be4dc60394025a59b48
Merge commit 'origin/master'

Conflicts:

src/addimagedialog.cpp
src/addimagedialog.cpp