Merge branch 'upstream' into development

Browse Source

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

...

This commit is contained in:

Reece H. Dunn

2013-03-16 15:52:46 +00:00

parent 3ec15aa700 e75e5d9258

commit b51fe6f892

7 changed files with 1946 additions and 1922 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/fr_rules

+1545 -1545

File diff suppressed because it is too large Load Diff