Mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords
Find a file
Eric House 31c443e4b1 Merge branch 'android_branch' into gtk_multigame
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GCMIntentService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
2013-05-22 07:01:08 -07:00
xwords4 Merge branch 'android_branch' into gtk_multigame 2013-05-22 07:01:08 -07:00
.gitignore ignore python shelf file 2012-11-15 06:16:03 -08:00