Eric House c3b2ecdb1d Merge branch 'android_branch' into relay_noconn		2015-08-25 06:46:35 -07:00
..
archive	Merge branch 'android_branch' into relay_noconn	2015-08-24 07:52:46 -07:00
assets	fix misspelling	2015-08-25 06:46:03 -07:00
img_src	add missing image	2015-08-24 07:42:36 -07:00
jni	Merge branch 'android_branch' into relay_noconn	2015-08-13 07:30:55 -07:00
libs	merge in changes from the -gcm directory: GCM will be a feature of the	2012-11-02 05:35:31 -07:00
res	Merge branch 'android_branch' into relay_noconn	2015-08-25 06:40:42 -07:00
res_src	Merge branch 'android_branch' into relay_noconn	2015-08-24 07:52:46 -07:00
src/org/eehouse/android/xw4	Merge branch 'android_branch' into relay_noconn	2015-08-25 06:40:42 -07:00
.gitignore	adding file required for proguard	2014-07-14 21:46:09 -07:00
AndroidManifest.xml	Merge branch 'android_branch' into relay_noconn	2015-08-25 06:40:42 -07:00
build.xml	up client version. There are no protocol-related changes to require	2015-06-06 11:53:43 -07:00
build_unchecked.xml	version of build.xml modified to pass -xline to javac. For future use...	2010-11-05 05:06:04 -07:00
proguard-project.txt	adding file required for proguard	2014-07-14 21:46:09 -07:00
project.properties	turn proguard back Off. Will get it working on another branch.	2014-07-14 22:37:10 -07:00