added Twig_Environment::mergeGlobals()
authorFabien Potencier <fabien.potencier@gmail.com>
Tue, 3 Apr 2012 17:13:43 +0000 (19:13 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Tue, 3 Apr 2012 17:13:43 +0000 (19:13 +0200)
commitf2f1f32b410e7ccf0d9f1591ec42eb300fdee339
treefabed1fceb49582c16dce508e4b13ebc297bfff2
parent3398b38cf0d0096fe9b0c3c948bf64efee392215
added Twig_Environment::mergeGlobals()
CHANGELOG
lib/Twig/Environment.php
lib/Twig/Node/Macro.php
lib/Twig/Template.php
test/Twig/Tests/Fixtures/tags/macro/global.test [new file with mode: 0644]
test/Twig/Tests/Node/MacroTest.php