]> gitweb.fperrin.net Git - Dictionary.git/commit
projects / Dictionary.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 14504fe 25ea6e9)
Merged. Switched back to name "Preferences" instead of "Settings".
authorThad Hughes <thadh@google.com>
Tue, 3 Dec 2013 18:49:47 +0000 (10:49 -0800)
committerThad Hughes <thadh@google.com>
Tue, 3 Dec 2013 18:49:47 +0000 (10:49 -0800)
commitc625416a33f9da39bb8ec6a2c9a67a7d47e477d8
treee1b2b349c94f1e10f4ddc6aa7ea23d879fbc35f6tree | snapshot
parent14504fe036ef1463cc7b6adb1f08fc465af42843commit | diff
parent25ea6e908f9d0d78bf6ad789aa2ecc66700e2087commit | diff
Merged.  Switched back to name "Preferences" instead of "Settings".

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

Conflicts:
res/xml/preferences.xml
src/com/hughes/android/dictionary/DictionaryActivity.java
src/com/hughes/android/dictionary/PreferenceActivity.java
AndroidManifest.xml diff1 | diff2 | blob | history
res/values/strings.xml diff1 | diff2 | blob | history
res/xml/preferences.xml diff1 | diff2 | blob | history
src/com/hughes/android/dictionary/DictionaryActivity.java diff1 | diff2 | blob | history
src/com/hughes/android/dictionary/DictionaryApplication.java diff1 | diff2 | blob | history
src/com/hughes/android/dictionary/DictionaryManagerActivity.java diff1 | diff2 | blob | history
src/com/hughes/android/dictionary/PreferenceActivity.java | diff2 | blob | history
"QuickDic" offline Dictionary App for Android. Provided downloadable dictionaries are based on Wiktionaries but can also be created from other sources (see DictionaryPC). Remember to use --recursive when cloning! Fork of project that used to be hosted at code.google.com/p/quickdic-dictionary.