summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2013-04-23 11:22:04 +0200
committerPhilipp Gesang <phg42.2a@gmail.com>2013-04-23 11:22:04 +0200
commitbd1c0d02304969137f74a70f5d2a435553c90944 (patch)
tree7c3dc50f78edba439b5b02db321e0e9855b6199e /doc
parent4701d59810a9a1aefd2d661abd3ba54a3248cf53 (diff)
parentf4fa20a933db69aad3b0823e1b53115078f095e0 (diff)
downloadluaotfload-bd1c0d02304969137f74a70f5d2a435553c90944.tar.gz
Merge branch 'master' of https://github.com/eroux/luaotfload into eroux-master
Conflicts: luaotfload.dtx
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions