From: Kate Alhola <kate@kathy.(none)>
Date: Thu, 26 Apr 2012 10:40:14 +0000 (+0300)
Subject: sync
X-Git-Url: https://vcs.maemo.org/git/?p=mardrone;a=commitdiff_plain;h=be3323e7ac4f9b107d3dba50da55710b8d7e2e47

sync
---

diff --git a/mardrone/ardrone_harmattan.qml b/mardrone/ardrone_harmattan.qml
index 35cf4d3..b7d162b 100644
--- a/mardrone/ardrone_harmattan.qml
+++ b/mardrone/ardrone_harmattan.qml
@@ -156,7 +156,7 @@ PageStackWindow {
             anchors.left:parent.left
             anchors.bottom:parent.bottom
             anchors.margins:10
-  //          joyBackground: ""
+            joyBackground: ""
             onYvChanged:{drone.vVelocity=-1*yv/200.0;}
             onXvChanged:{drone.yaw=xv/200.0;}
             onPressedChanged: { drone.ctrlActive=pressed;}
@@ -166,7 +166,7 @@ PageStackWindow {
              visible: !drone.confUseJoyStick
             id:rj
 
-      //      joyBackground: ""
+            joyBackground: ""
             anchors.right:parent.right
             anchors.bottom:parent.bottom
             width:200;height:200;