projects / konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 120cde3 b013ede)
merged branch weltling/master (PR #854)
authorFabien Potencier <fabien.potencier@gmail.com>
Thu, 4 Oct 2012 17:41:45 +0000 (19:41 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Thu, 4 Oct 2012 17:41:45 +0000 (19:41 +0200)
This PR was merged into the master branch.

Commits
-------

b013ede fix windows build

Discussion
----------

Trivial fix for windows build


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.