]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03b1da5 0110662)
Merge branch 'PHP-5.4' into PHP-5.5 (strategy ours)
authorGustavo Lopes <glopes@nebm.ist.utl.pt>
Sat, 2 Feb 2013 17:40:05 +0000 (18:40 +0100)
committerGustavo Lopes <glopes@nebm.ist.utl.pt>
Sat, 2 Feb 2013 17:40:05 +0000 (18:40 +0100)
* PHP-5.4:
  Move macro back to .c file


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