Mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords

Eric House 8327fa71a1 Merge branch 'android_branch' into android_translate ... # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.		2016-01-29 06:03:58 -08:00
xwords4	Merge branch 'android_branch' into android_translate	2016-01-29 06:03:58 -08:00
.gitignore	hide core files	2014-10-17 18:37:08 -07:00
.projectile	add projectile file now that I have some confidence it what it's doing	2014-10-10 07:38:27 -07:00