Merge pull request #1554 from chrox/master

Browse Source

fix local font alias registered in font menu and add Dutch hyphenation dict

...

This commit is contained in:

Qingping Hou

2015-06-15 00:58:15 -04:00

parent 63fb8af937 e9d19965eb

commit e8c15541ef

2 changed files with 2 additions and 2 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

2

base

Submodule base updated: 12ed264734...3e67f2814c

2

platform/android/luajit-launcher

Submodule platform/android/luajit-launcher updated: ddcf09b0f8...72244776be