Merge branch 'upstream' into development

Browse Source

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

...

This commit is contained in:

Reece H. Dunn

2014-02-02 13:44:02 +00:00

parent 464e4d7e11 350f12bdc0

commit f2d6de1d91

28 changed files with 2578 additions and 1241 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

dictsource/da_rules

+926 -698

File diff suppressed because it is too large Load Diff