Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-10 05:26:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
xwords/xwords4/android/XWords4/res_src
History
Eric House 1df48d2792 Merge branch 'android_branch' into relay_noconn 
Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
	xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
2015-08-21 07:17:31 -07:00
..
values-ba_CK Merge branch 'android_branch' into relay_noconn 2015-08-21 07:17:31 -07:00
values-ca copy over new translations from translation branch. 2015-08-17 07:04:10 -07:00
values-ca_PS Merge branch 'android_branch' into relay_noconn 2015-08-21 07:17:31 -07:00
values-cs use android's build-in OK and Cancel strings 2015-05-27 07:05:59 -07:00
values-fr funnel invitation notifications from all three channels into same 2015-07-11 15:47:35 -07:00
values-nl copy over new translations from translation branch. 2015-08-17 07:04:10 -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