From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sun, 11 Sep 2016 11:26:30 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0RC2~31^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd16b64f0100cbeae4458e98b59b2c6c23c14982;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

cd16b64f0100cbeae4458e98b59b2c6c23c14982
diff --cc .gitignore
index a00615f966,1ce1eabfe9..c427f0da64
--- a/.gitignore
+++ b/.gitignore
@@@ -140,14 -133,9 +140,15 @@@ tests/*/*/*.s
  */tests/*/*.exp
  */tests/*/*.log
  */tests/*/*.sh
 +*/tests/*/*/*.diff
 +*/tests/*/*/*.out
 +*/tests/*/*/*.php
 +*/tests/*/*/*.exp
 +*/tests/*/*/*.log
 +*/tests/*/*/*.sh
  */*/tests/*.diff
  */*/tests/*.out
+ */*/tests/*.out.png
  */*/tests/*.php
  */*/tests/*.exp
  */*/tests/*.log