19 commits

Author	SHA1	Message	Date
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
Eric House	e0327b0f62	ignore files	2015-08-20 07:41:48 -07:00
Eric House	1d14d4cc65	ignore new files	2015-08-10 06:52:31 -07:00
Eric House	6871ef24a6	move several strings, including app name, NBS port, and url prefix, into generated ... .xml file so Dbg and regular variants can co-exist better Conflicts: xwords4/android/XWords4/archive/R.java	2015-08-03 04:55:59 -07:00
Eric House	8182fc7822	move several strings, including app name, NBS port, and url prefix, into generated ... .xml file so Dbg and regular variants can co-exist better	2015-08-01 22:40:24 -07:00
Eric House	0425df7a5e	move several strings, including app name, NBS port, and url prefix, into generated ... .xml file so Dbg and regular variants can co-exist better	2015-08-01 22:39:00 -07:00
Eric House	7c8c6bb55b	move app name into resource that's not copied to fix dbg variant ... having empty name (though it didn't before)	2015-07-25 08:52:33 -07:00
Eric House	e62993f60e	ignore all the new files being copied over	2015-07-25 08:23:12 -07:00
Eric House	27972d10e7	new files to ignore	2014-06-18 20:23:58 -07:00
Eric House	9bf92257b9	ignore more stuff	2014-05-19 07:54:08 -07:00
Eric House	f5f7428683	fix debug tree to build again, this time with a paramaterized common ... xml file	2014-04-16 21:06:41 -07:00
Eric House	ef381f1d71	hide more files (changes generated)	2014-03-24 20:27:19 -07:00
Eric House	9af9e2089b	ignore more files in dbg dir	2014-03-24 19:54:35 -07:00
Eric House	c982fb54d9	up strings and notes for new release	2014-03-06 06:47:43 -08:00
Eric House	d02481879b	catch debug variant up with recent changes and lay groundwork for including crittercism in it.	2014-02-10 07:31:52 -08:00
Eric House	788f241238	new files to .gitignores; go back to discarding build command output	2012-03-01 06:32:49 -08:00
Eric House	9194bbe4b1	replace large with small on the -dbg version	2012-02-29 17:49:34 -08:00
Eric House	0732da0724	checking this file in -- the first to be different in a variant	2012-02-27 19:39:36 -08:00
Eric House	e3ffbd57ba	add .gitignore files generated by script	2012-02-13 22:27:08 -08:00