]> gitweb.fperrin.net Git - DictionaryPC.git/commit
2 types of TokenRow.
authorThad Hughes <thad.hughes@gmail.com>
Mon, 16 Jan 2012 07:14:01 +0000 (23:14 -0800)
committerThad Hughes <thad.hughes@gmail.com>
Mon, 16 Jan 2012 07:14:01 +0000 (23:14 -0800)
commit1aa4de25c859304d21acfadd18cb546d1c21415b
tree490af81e490cc23a9681a9a9cfb3f847d475689b
parent297e7670b0c1487cdddb82dd2259f902d4ed80ae
parent482bc692ba8274fdcd36efd8714aaedee778300a
2 types of TokenRow.

Merge branch 'master' of
https://code.google.com/p/quickdic-dictionary.dictionarypc

Conflicts:
src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java
todo.txt
13 files changed:
data/downloadInputs.sh
src/com/hughes/android/dictionary/engine/DictionaryBuilder.java
src/com/hughes/android/dictionary/engine/WiktionarySplitter.java
testdata/goldens/de-en.quickdic.text
testdata/goldens/wiktionary.ar_ar.quickdic.text
testdata/goldens/wiktionary.de_de.quickdic.text
testdata/goldens/wiktionary.de_en.quickdic.text
testdata/goldens/wiktionary.fr_fr.quickdic.text
testdata/goldens/wiktionary.it_en.quickdic.text
testdata/goldens/wiktionary.it_it.quickdic.text
testdata/goldens/wiktionary.zh_en.quickdic.text
testdata/goldens/wiktionary.zh_zh.quickdic.text
todo.txt