<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/php-git.git/ext/interbase/tests, branch PHP-5.6.15</title>
<subtitle>git.php.net: repository/php-src.git
</subtitle>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/php-git.git/'/>
<entry>
<title>typo fixes - https://github.com/vlajos/misspell_fixer</title>
<updated>2014-11-23T22:33:43+00:00</updated>
<author>
<name>Veres Lajos</name>
<email>vlajos@gmail.com</email>
</author>
<published>2014-11-20T20:00:07+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/php-git.git/commit/?id=4dc994571d2def413a83a607885f3e809b60019d'/>
<id>4dc994571d2def413a83a607885f3e809b60019d</id>
<content type='text'>
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'PHP-5.4' into PHP-5.5</title>
<updated>2014-04-10T14:43:09+00:00</updated>
<author>
<name>Popa Adrian Marius</name>
<email>mapopa@reea.net</email>
</author>
<published>2014-04-10T14:43:09+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/php-git.git/commit/?id=1a0b80fe90a7440d9aaa3139fae951cc49b162e6'/>
<id>1a0b80fe90a7440d9aaa3139fae951cc49b162e6</id>
<content type='text'>
* PHP-5.4:
  Cleanup $ is not needed for git
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* PHP-5.4:
  Cleanup $ is not needed for git
</pre>
</div>
</content>
</entry>
<entry>
<title>Cleanup $ is not needed for git</title>
<updated>2014-04-10T14:42:32+00:00</updated>
<author>
<name>Popa Adrian Marius</name>
<email>mapopa@reea.net</email>
</author>
<published>2014-04-10T14:42:32+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/php-git.git/commit/?id=1c3ed86211c25eb8f11330b5214d4e03672115ab'/>
<id>1c3ed86211c25eb8f11330b5214d4e03672115ab</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'pull-request/341'</title>
<updated>2013-06-10T21:30:59+00:00</updated>
<author>
<name>Stanislav Malyshev</name>
<email>stas@php.net</email>
</author>
<published>2013-06-10T21:20:18+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/php-git.git/commit/?id=02e4d7a290ae437688b3a3d114621a1d32444560'/>
<id>02e4d7a290ae437688b3a3d114621a1d32444560</id>
<content type='text'>
* pull-request/341: (23 commits)
  typofixes
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* pull-request/341: (23 commits)
  typofixes
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'pull-request/341'</title>
<updated>2013-06-10T21:20:18+00:00</updated>
<author>
<name>Stanislav Malyshev</name>
<email>stas@php.net</email>
</author>
<published>2013-06-10T21:20:18+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/php-git.git/commit/?id=ac40c0b562b0f90652cadef83968d7305626c377'/>
<id>ac40c0b562b0f90652cadef83968d7305626c377</id>
<content type='text'>
* pull-request/341: (23 commits)
  typofixes
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* pull-request/341: (23 commits)
  typofixes
</pre>
</div>
</content>
</entry>
<entry>
<title>Remove executable permission on inc</title>
<updated>2012-10-10T02:44:34+00:00</updated>
<author>
<name>Xinchen Hui</name>
<email>laruence@php.net</email>
</author>
<published>2012-10-10T02:44:34+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/php-git.git/commit/?id=1b9e0de2ccab0d6ae6f77b53b5c3a306ec154496'/>
<id>1b9e0de2ccab0d6ae6f77b53b5c3a306ec154496</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Remove executable permission on phpt</title>
<updated>2012-10-10T02:27:49+00:00</updated>
<author>
<name>Xinchen Hui</name>
<email>laruence@php.net</email>
</author>
<published>2012-10-10T02:27:49+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/php-git.git/commit/?id=610c7fbe7b93498154b17e4e81018b72fa15ec45'/>
<id>610c7fbe7b93498154b17e4e81018b72fa15ec45</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'PHP-5.4'</title>
<updated>2012-10-10T02:45:34+00:00</updated>
<author>
<name>Xinchen Hui</name>
<email>laruence@php.net</email>
</author>
<published>2012-10-10T02:45:34+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/php-git.git/commit/?id=4e5e8c9da093f9237d2a71a7442e94a2a22f370a'/>
<id>4e5e8c9da093f9237d2a71a7442e94a2a22f370a</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'PHP-5.4'</title>
<updated>2012-10-10T02:32:38+00:00</updated>
<author>
<name>Xinchen Hui</name>
<email>laruence@php.net</email>
</author>
<published>2012-10-10T02:32:38+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/php-git.git/commit/?id=4b152e5470f7369c76568da8014a10fa87e2c471'/>
<id>4b152e5470f7369c76568da8014a10fa87e2c471</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>sync firebird test 003 with the 5.4 branch , eliminate failing test http://gcov.php.net/viewer.php?version=PHP_5_3&amp;func=tests&amp;file=ext%2Finterbase%2Ftests%2F003.phpt</title>
<updated>2012-01-10T05:26:20+00:00</updated>
<author>
<name>Popa Adrian Marius</name>
<email>mariuz@php.net</email>
</author>
<published>2012-01-10T05:26:20+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/php-git.git/commit/?id=b69f55c12e58f2bbf08afafb5c111c054b9ba7d9'/>
<id>b69f55c12e58f2bbf08afafb5c111c054b9ba7d9</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
