diff options
author | Elie Roux <elie.roux@telecom-bretagne.eu> | 2013-04-18 18:09:20 +0200 |
---|---|---|
committer | Elie Roux <elie.roux@telecom-bretagne.eu> | 2013-04-18 18:09:20 +0200 |
commit | a9510469b60edeceedf72811e7737ea0f3c56dc5 (patch) | |
tree | 5c7a80ce3a0c2f1d22c12bff36f84355df554c46 /misc | |
parent | e67643a60422ed265dc5ad8955a83140598385f1 (diff) | |
parent | b0c22678d1f776f991ffef67694451b8bb5f9e20 (diff) | |
download | luaotfload-a9510469b60edeceedf72811e7737ea0f3c56dc5.tar.gz |
Merge branch 'experimental' of phi-gamma/luaotfload into phi-gamma-experimental
Conflicts:
mkluatexfontdb.lua
otfl-basics-gen.lua
Diffstat (limited to 'misc')
0 files changed, 0 insertions, 0 deletions