xwords/xwords4/android/XWords4/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 Merge branch 'android_branch' into relay_noconn 2015-08-24 07:52:46 -07:00
values-ca Translated using Weblate (Catalan) 2015-08-23 21:14:34 -07:00
values-ca_PS Merge branch 'android_branch' into relay_noconn 2015-08-24 07:52:46 -07:00
values-cs use android's build-in OK and Cancel strings 2015-05-27 07:05:59 -07:00
values-fr Merge branch 'android_branch' into relay_noconn 2015-08-23 21:18:05 -07:00
values-nl Translated using Weblate (Dutch) 2015-08-23 21:17:16 -07:00
values-pt funnel invitation notifications from all three channels into same 2015-07-11 15:47:35 -07:00
values-sk funnel invitation notifications from all three channels into same 2015-07-11 15:47:35 -07:00