Skip to content
Browse files

Merge branch 'master' into production

Conflicts:
	AndroidManifest.xml
  • Loading branch information...
2 parents bcd21a2 + 1d0ad2d commit e8ec8c52399bda6a45d9be2511ff0fa7dd88a7b6 @mattfeury committed Mar 13, 2012
Showing with 6 additions and 1 deletion.
  1. +1 −1 AndroidManifest.xml
  2. +5 −0 src/com/mattfeury/saucillator/android/utilities/MapFunc.java
View
2 AndroidManifest.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:installLocation="auto"
- android:versionName="1.0 Alfredo" android:versionCode="4" package="com.mattfeury.saucillator.android">
+ android:versionName="1.0.1 Alfredo" android:versionCode="5" package="com.mattfeury.saucillator.android">
<uses-sdk android:targetSdkVersion="10" android:minSdkVersion="8"></uses-sdk><supports-screens
android:smallScreens="true"
View
5 src/com/mattfeury/saucillator/android/utilities/MapFunc.java
@@ -0,0 +1,5 @@
+package com.mattfeury.saucillator.android.utilities;
+
+public interface MapFunc<K, R> {
+ public Box<R> func(K k);
+}

0 comments on commit e8ec8c5

Please sign in to comment.
Something went wrong with that request. Please try again.