Commit Graph

7 Commits

Author SHA1 Message Date
Derick Rethans c4a7d1983d Merge branch 'master' of github.com:derickr/twig-ext
Conflicts:
	ext/twig/twig.c
2011-11-21 11:09:34 +00:00
Derick Rethans 7d37d66317 Make the extension ZTS-proof. 2011-11-21 11:08:17 +00:00
Derick Rethans 9879ca216d Merge branch 'master' of github.com:derickr/twig-ext 2011-11-21 08:37:45 +00:00
Derick Rethans 40ec6713ee Fixed name in license. 2011-11-21 08:34:59 +00:00
Derick Rethans 229c07c6a6 Added another workaround for PHP 5.4 support. 2011-11-20 21:41:07 +00:00
Derick Rethans f7f8346d37 Switch LICENSE to Revised BSD. 2011-11-20 21:26:21 +00:00
Derick Rethans 16ca05529c Move files into ext/twig. 2011-11-20 21:25:05 +00:00