Commit graph

4 commits

Author SHA1 Message Date
Eric House
ff49ce61a5 ignore new language files 2016-02-05 07:13:55 -08:00
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
Eric House
e62993f60e ignore all the new files being copied over 2015-07-25 08:23:12 -07:00
Eric House
49001c6893 various changes so dbg and bt versions build again -- and may work, but
that's not tested yet.
2014-05-11 19:55:05 -07:00