diff options
| author | Philipp Gesang <phg42.2a@gmail.com> | 2013-11-05 20:52:25 +0100 |
|---|---|---|
| committer | Philipp Gesang <phg42.2a@gmail.com> | 2013-11-05 20:52:25 +0100 |
| commit | 74207efa91378a06eea07e24f65346e9e4a4eb3c (patch) | |
| tree | 3521aac1fc7a28ff2a1c971eca94cf36ec53c06e /src | |
| parent | 9dc36bf3fc8a076d53b8abcb35c9c86f167a2d3a (diff) | |
| parent | c05e323e497d7d8e3befb371d6b78e1f91be83d9 (diff) | |
| download | luaotfload-74207efa91378a06eea07e24f65346e9e4a4eb3c.tar.gz | |
Merge branch 'font-matching'
Conflicts:
NEWS
luaotfload-database.lua
luaotfload-override.lua
luaotfload.dtx
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions