diff options
| author | goblin911 <goblinliu@gmail.com> | 2013-08-25 21:16:45 +0800 |
|---|---|---|
| committer | goblin911 <goblinliu@gmail.com> | 2013-08-25 21:16:45 +0800 |
| commit | 2efdc2f20f0306791ced5ec78a1acddfaf086f42 (patch) | |
| tree | a85f2b32d6e6da9d7329ab975fea3bd79e1b94b6 /client/Piztor/res/layout/activity_init.xml | |
| parent | e5599da7fdd344fdcb49e8d6780a1e2ad358ee2d (diff) | |
| parent | 263967cbb477983ae8680b431c1d93f102971c30 (diff) | |
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
Diffstat (limited to 'client/Piztor/res/layout/activity_init.xml')
| -rw-r--r-- | client/Piztor/res/layout/activity_init.xml | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/client/Piztor/res/layout/activity_init.xml b/client/Piztor/res/layout/activity_init.xml deleted file mode 100644 index 43e6253..0000000 --- a/client/Piztor/res/layout/activity_init.xml +++ /dev/null @@ -1,16 +0,0 @@ -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingBottom="@dimen/activity_vertical_margin" - android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" - android:paddingTop="@dimen/activity_vertical_margin" - tools:context=".InitAct" > - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/hello_world" /> - -</RelativeLayout> |