Mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords
Find a file
Eric House 4e1a382f1e Merge branch 'android_branch' into relay_noconn
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
2015-08-11 07:42:05 -07:00
xwords4 Merge branch 'android_branch' into relay_noconn 2015-08-11 07:42:05 -07:00
.gitignore hide core files 2014-10-17 18:37:08 -07:00
.projectile add projectile file now that I have some confidence it what it's doing 2014-10-10 07:38:27 -07:00