Code

Merge from trunk.
authorJon A. Cruz <jon@joncruz.org>
Sat, 18 Dec 2010 06:03:56 +0000 (22:03 -0800)
committerJon A. Cruz <jon@joncruz.org>
Sat, 18 Dec 2010 06:03:56 +0000 (22:03 -0800)
1  2 
src/verbs.cpp
src/widgets/desktop-widget.cpp

diff --cc src/verbs.cpp
Simple merge
Simple merge