xwords/xwords4/android/XWords4-dbg/res_src/values-nl
Eric House b79836c61b Merge branch 'android_branch' into relay_noconn
Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
2015-08-24 07:52:46 -07:00
..
.gitignore Merge branch 'android_branch' into relay_noconn 2015-08-24 07:52:46 -07:00