summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <shumakl@purdue.edu>2014-05-04 19:31:42 -0400
committerLuke Shumaker <shumakl@purdue.edu>2014-05-04 19:31:42 -0400
commite5ce76cc030792de5a53dc8aad3b214ab2f6538b (patch)
tree0971fce3f0e5507ffc9946ca6a11499735503d55
parent665330a5eda56339a078944dbfde2efbf84d2a03 (diff)
parent1e030af67b5a2deca60429bd9292a483cd62f5cd (diff)
Merge branch 'lukeshu' of github.com:AndrewMurrell/minak into lukeshu
-rw-r--r--.classpath4
-rwxr-xr-xgesturesbin0 -> 77922 bytes
-rw-r--r--res/drawable-hdpi/ic_launcher.pngbin9397 -> 4615 bytes
-rw-r--r--res/drawable-mdpi/ic_launcher.pngbin5237 -> 1994 bytes
-rw-r--r--res/drawable-xhdpi/ic_launcher.pngbin14383 -> 3538 bytes
5 files changed, 2 insertions, 2 deletions
diff --git a/.classpath b/.classpath
index 7bc01d9..5176974 100644
--- a/.classpath
+++ b/.classpath
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
diff --git a/gestures b/gestures
new file mode 100755
index 0000000..097ba09
--- /dev/null
+++ b/gestures
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png
index 96a442e..2494b61 100644
--- a/res/drawable-hdpi/ic_launcher.png
+++ b/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png
index 359047d..deb71bc 100644
--- a/res/drawable-mdpi/ic_launcher.png
+++ b/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png
index 71c6d76..50e38d7 100644
--- a/res/drawable-xhdpi/ic_launcher.png
+++ b/res/drawable-xhdpi/ic_launcher.png
Binary files differ