From: Kate Alhola <kate@kate-alholas-macbook-pro.local>
Date: Wed, 11 Apr 2012 11:31:36 +0000 (+0300)
Subject: sync repository
X-Git-Url: https://vcs.maemo.org/git/?p=mardrone;a=commitdiff_plain;h=b083fe0448071b1fec2198b2a15eeb4ebed23b68

sync repository
---

diff --git a/mardrone/CalibrateDialogDesktop.qml b/mardrone/CalibrateDialogDesktop.qml
new file mode 100644
index 0000000..849444f
--- /dev/null
+++ b/mardrone/CalibrateDialogDesktop.qml
@@ -0,0 +1,14 @@
+import QtQuick 1.0
+import QtDesktop 0.1
+Dialog {
+        property color textColor:"black"
+        property int textSize:30
+        id:calibrateDialog
+        width: 800
+        height: 600
+        data:
+        JoyStickCalibratorDesktop {
+            id:jsCalibrator
+
+        }
+}
diff --git a/mardrone/ardrone-lib-android/libpc_ardrone_notool.a b/mardrone/ardrone-lib-android/libpc_ardrone_notool.a
new file mode 100644
index 0000000..1ea141c
Binary files /dev/null and b/mardrone/ardrone-lib-android/libpc_ardrone_notool.a differ
diff --git a/mardrone/ardrone-lib-android/libsdk.a b/mardrone/ardrone-lib-android/libsdk.a
new file mode 100644
index 0000000..97d3d05
Binary files /dev/null and b/mardrone/ardrone-lib-android/libsdk.a differ
diff --git a/mardrone/ardrone-lib-android/libvlib.a b/mardrone/ardrone-lib-android/libvlib.a
new file mode 100644
index 0000000..9cb87b3
Binary files /dev/null and b/mardrone/ardrone-lib-android/libvlib.a differ
diff --git a/mardrone/gear32x32.png b/mardrone/gear32x32.png
new file mode 100644
index 0000000..55ceb06
Binary files /dev/null and b/mardrone/gear32x32.png differ