Mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords
Find a file
Eric House 8a58492389 Merge branch 'android_branch' into android_groups
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListAdapter.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
2012-12-18 06:35:07 -08:00
xwords4 Merge branch 'android_branch' into android_groups 2012-12-18 06:35:07 -08:00
.gitignore ignore python shelf file 2012-11-15 06:16:03 -08:00