]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorReeze Xia <reeze@php.net>
Tue, 3 Mar 2015 03:44:52 +0000 (11:44 +0800)
committerReeze Xia <reeze@php.net>
Tue, 3 Mar 2015 03:44:52 +0000 (11:44 +0800)
commitc6e415aeb2deb733636b9f181361ad4728971197
tree7b244e98f9e9ef98c20a30f9c4e22514efb445ab
parentfa2450c5f817730a8c7016a88fe9dd02b09524e1
parent4e2c87edb34c4f151da6899d523c93b8e8565975
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #67741 (auto_prepend_file messes up __LINE__)

Conflicts:
main/main.c
main/main.c