Merge branch 'cover'
authorNikolay Tischenko <niktischenko@gmail.com>
Sun, 31 Oct 2010 21:02:01 +0000 (03:02 +0600)
committerNikolay Tischenko <niktischenko@gmail.com>
Sun, 31 Oct 2010 21:02:01 +0000 (03:02 +0600)
commitf03c91ef8e13169b564194e65fb3748a715b286c
tree7134b63887aee3665535a27dcd52bf6c04389932
parente5663473334ba86d29412897204c0bd610bf39f2
parent525ec3e92df6d1737da40e965ba76b6c41be820f
Merge branch 'cover'

Conflicts:
src/clickablelabel.cpp