d53c36e67f
Conflicts: src/ass_parser.cpp |
||
---|---|---|
.. | ||
ass | ||
common | ||
include/libaegisub | ||
osx | ||
unix | ||
windows | ||
lagi_pre.h | ||
Makefile |
d53c36e67f
Conflicts: src/ass_parser.cpp |
||
---|---|---|
.. | ||
ass | ||
common | ||
include/libaegisub | ||
osx | ||
unix | ||
windows | ||
lagi_pre.h | ||
Makefile |