Merge "menu: create controller menu" into features/qt_dr
authorSangho Park <sangho1206.park@samsung.com>
Tue, 5 Aug 2014 01:40:09 +0000 (18:40 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 5 Aug 2014 01:40:09 +0000 (18:40 -0700)
1  2 
tizen/src/ui/menu/contextmenu.cpp
tizen/src/ui/menu/contextmenu.h

Simple merge
index eb38728fc333f9dc60927367ba1d54a792f62f91,2ed94e7340fd9b5dcc429161de82edbe73cb33c2..11b51fefedc7e2fc53e0f6ce7d3d130cdeae45b0
@@@ -27,8 -26,8 +27,9 @@@ public slots
      void slotTopMost(bool check);
      void slotRotate(int angle);
      void slotScale(int scale);
+     void slotController(int index);
      void slotShell();
 +    void slotControlPanel();
      void slotAbout();
      void slotForceClose();
      void slotClose();