Merge from default branch

2010-09-24 22:49:15 +02:00
parent 18d6799cbe
commit dc2350cee8
145 changed files with 23287 additions and 17316 deletions
--- a/rtgui/toolbar.h
+++ b/rtgui/toolbar.h
@@ -55,6 +55,8 @@ class ToolBar : public Gtk::HBox {
    void wb_pressed ();
    void crop_pressed ();
    void stra_pressed ();
+
+    bool handleShortcutKey (GdkEventKey* event);
 };

 #endif