Merge branch 'master' of https://github.com/Determinant/piztor

Conflicts:
	client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class
	client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$id.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$string.class
	client/Piztor/gen/com/macaroon/piztor/R.java
	client/Piztor/res/values/strings.xml
	client/bin/classes/com/macaroon/piztor/ActStatus.class
	client/bin/classes/com/macaroon/piztor/EmptyStatus.class
	client/bin/classes/com/macaroon/piztor/Setting.class
	client/src/com/macaroon/piztor/AppMgr.java
	client/src/com/macaroon/piztor/Setting.java

1 files changed, 0 insertions, 14 deletions

diff --git a/client/gps-demo/AndroidGPSTracking/res/layout/main.xml b/client/gps-demo/AndroidGPSTracking/res/layout/main.xml
deleted file mode 100644
index 430efa2..0000000
--- a/client/gps-demo/AndroidGPSTracking/res/layout/main.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

-    android:layout_width="fill_parent"

-    android:layout_height="fill_parent"

-    android:orientation="vertical" >

-    

-    <Button android:id="@+id/btnShowLocation" 

-        android:layout_width="wrap_content"

-        android:layout_height="wrap_content"

-        android:text="Show Location"

-        android:layout_centerVertical="true"

-        android:layout_centerHorizontal="true"/>

-

-</RelativeLayout>
\ No newline at end of file