Merge branch 'gestures'
commit5ea21ab05d0234961cf5a23e02473794dc8513f3
authorDavid Greaves <david@dgreaves.com>
Sat, 21 Mar 2009 17:10:02 +0000 (21 17:10 +0000)
committerDavid Greaves <david@dgreaves.com>
Sat, 21 Mar 2009 17:10:02 +0000 (21 17:10 +0000)
treecc925d25d765bd83a58b3b9646b77151717ee3ab
parent01de58dce531ba02c384f3e818aa74b2690a874b
parent81beae517acb89c030d46c4228c0103bb3372da8
Merge branch 'gestures'

Tidy resources file
remove stray debug
shopper.pro
src/main.cc
src/ui/ItemView.cc