author | Jon A. Cruz <jon@joncruz.org> | |
Sat, 18 Dec 2010 06:03:56 +0000 (22:03 -0800) | ||
committer | Jon A. Cruz <jon@joncruz.org> | |
Sat, 18 Dec 2010 06:03:56 +0000 (22:03 -0800) |
1 | 2 | |||
---|---|---|---|---|
src/verbs.cpp | patch | | diff1 | | diff2 | | blob | history |
src/widgets/desktop-widget.cpp | patch | | diff1 | | diff2 | | blob | history |
diff --cc src/verbs.cpp
Simple merge
diff --cc src/widgets/desktop-widget.cpp
Simple merge