Eric House 7d8cddb31f Merge branch 'android_branch' into gtk_multigame ... Conflicts: xwords4/linux/gtkmain.c xwords4/linux/linuxmain.c xwords4/relay/xwrelay.cpp		2013-05-08 07:37:55 -07:00
..
.gitignore	gitignore additions	2010-06-05 07:50:09 -07:00
app_name.xml	up version/changes for next release	2013-04-16 07:14:03 -07:00
common_rsrc.xml	debug pref to disable GCM so new stuff can be tested on-device	2013-01-25 07:16:38 -08:00
strings.xml	fix type in English string	2013-04-18 19:46:12 -07:00
styles.xml	make the two buttons fill the screen, and use newly created style	2012-11-20 19:11:39 -08:00