xwords/xwords4/android/XWords4/res
Eric House 389a09ac1a 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-13 07:30:55 -07:00
..
drawable use new game type icons 2015-01-03 15:17:12 -08:00
drawable-hdpi remove unused images 2013-10-24 06:40:20 -07:00
drawable-mdpi remove unused images 2013-10-24 06:40:20 -07:00
drawable-xhdpi remove unused images 2013-10-24 06:40:20 -07:00
layout move last-pressed button to bottom of screen where it's natural to look for it 2015-08-03 04:58:18 -07:00
layout-small add missing ID so background coloring can work 2014-07-30 07:05:34 -07:00
menu get rid of About menuitem in board -- in main view is enough 2015-07-31 07:14:04 -07:00
menu-small get rid of About menuitem in board -- in main view is enough 2015-07-31 07:14:04 -07:00
values Merge branch 'android_branch' into relay_noconn 2015-08-13 07:30:55 -07:00
values-ca move French strings into res_src/, and add script to filter/copy all 2015-03-27 07:26:51 -07:00
values-cs move French strings into res_src/, and add script to filter/copy all 2015-03-27 07:26:51 -07:00
values-fr this is now a generated file 2015-03-27 07:28:52 -07:00
values-large add toolbar button style for 'large' devices so buttons are bigger on 2012-07-02 07:39:06 -07:00
values-pt move French strings into res_src/, and add script to filter/copy all 2015-03-27 07:26:51 -07:00
values-sk move French strings into res_src/, and add script to filter/copy all 2015-03-27 07:26:51 -07:00
xml add debug option to allow device to send relay-invitation to 2015-07-12 20:49:53 -07:00