xwords/xwords4/android/XWords4-dbg/res_src
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
..
values-ba_CK ignore all the new files being copied over 2015-07-25 08:23:12 -07:00
values-ca ignore all the new files being copied over 2015-07-25 08:23:12 -07:00
values-ca_PS ignore all the new files being copied over 2015-07-25 08:23:12 -07:00
values-cs ignore all the new files being copied over 2015-07-25 08:23:12 -07:00
values-fr ignore all the new files being copied over 2015-07-25 08:23:12 -07:00
values-nl Merge branch 'android_branch' into relay_noconn 2015-08-24 07:52:46 -07:00
values-pt ignore all the new files being copied over 2015-07-25 08:23:12 -07:00
values-sk ignore all the new files being copied over 2015-07-25 08:23:12 -07:00