Niels Martin Hansen d53c36e67f Merge branch 'extradata' ...

Conflicts:
	src/ass_parser.cpp

2014-04-25 17:22:15 +02:00

..

ass

Kill config.h and just force-include acconf.h in non-pch builds

2014-04-16 08:11:37 -07:00

common

Preserve the insertion point (but not selection) when switching between lines

2014-04-25 08:00:45 -07:00

include/libaegisub

Merge branch 'extradata'

2014-04-25 17:22:15 +02:00

osx

Kill config.h and just force-include acconf.h in non-pch builds

2014-04-16 08:11:37 -07:00

unix

Move make_unique to its own header file

2014-04-23 15:29:23 -07:00

windows

Move make_unique to its own header file

2014-04-23 15:29:23 -07:00

lagi_pre.h

Kill config.h and just force-include acconf.h in non-pch builds

2014-04-16 08:11:37 -07:00

Makefile

Remove -Wno-variadic-macros from CXXFLAGS

2014-04-23 15:29:23 -07:00