merge local heads

This commit is contained in:
Eric House 2016-02-18 07:47:46 -08:00
commit 50107949f2
2 changed files with 1 additions and 1 deletions

View file

@ -2,7 +2,6 @@
obj_linux_memdbg
*.xwg
obj_linux_rel
*.xwd
log_*_*.txt
discon_ok2.sh_logs
test_backsend.sh_*

1
xwords4/linux/dict.xwd Symbolic link
View file

@ -0,0 +1 @@
../android/XWords4/assets/CollegeEng_2to8.xwd