<feed xmlns='http://www.w3.org/2005/Atom'>
<title>adodb/replicate, branch v5.22.11-lsc</title>
<subtitle>adodb PHP Database Abstraction Layer
</subtitle>
<id>https://git.rdm1.uk/adodb/.git/atom?h=v5.22.11-lsc</id>
<link rel='self' href='https://git.rdm1.uk/adodb/.git/atom?h=v5.22.11-lsc'/>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/'/>
<updated>2022-01-08T10:49:25Z</updated>
<entry>
<title>Deprecate Database Replication add-on (#780)</title>
<updated>2022-01-08T10:49:25Z</updated>
<author>
<name>Damien Regad</name>
<email>dregad@mantisbt.org</email>
</author>
<published>2022-01-08T10:49:25Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=1d4ee53e48a6749e5b2de9e229125cb417b1ef36'/>
<id>urn:sha1:1d4ee53e48a6749e5b2de9e229125cb417b1ef36</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Redo Merge branch 'hotfix/5.21' Standardized file headers</title>
<updated>2021-08-16T22:48:04Z</updated>
<author>
<name>Damien Regad</name>
<email>dregad@mantisbt.org</email>
</author>
<published>2021-08-16T22:48:04Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=d558d101c514beeb8c91f65ae61d106b201dc472'/>
<id>urn:sha1:d558d101c514beeb8c91f65ae61d106b201dc472</id>
<content type='text'>
Try to do it right this time...

# Conflicts:
#	adodb-memcache.lib.inc.php

Fixes #751
</content>
</entry>
<entry>
<title>Revert changes since Standardized file headers merge</title>
<updated>2021-08-16T22:30:04Z</updated>
<author>
<name>Damien Regad</name>
<email>dregad@mantisbt.org</email>
</author>
<published>2021-08-16T22:30:04Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=507466ef798b18a3a8830230cfcd51bb488513cf'/>
<id>urn:sha1:507466ef798b18a3a8830230cfcd51bb488513cf</id>
<content type='text'>
The conflicts resolution applied when merging the Standardized file
headers (commit e9dcce3df24912ad869d0193f0b419f2309101fc) was seriously
messed up, actually overwriting a number of changes in the master
branch.

Rather than trying to go and fix things one by one which has a high risk
of messing things further, it's easier to redo the merge from a clean
slate, so this commit reverts the following:

- "Merge branch 'hotfix/5.21' Standardized file headers",
  e9dcce3df24912ad869d0193f0b419f2309101fc
- "Merge tag 'v5.21.1'",
  5f437df3104159d5d659f60e31bef8d33c34995f
- "Reset version to 5.22.0-dev"
  af9234a525c3255af051a330164486d73be4c63a
- "Fix incorrect resolution of merge conflicts"
  a6733f61b0165b366c8d2c70d9af82edc3881951.
- "Fix syntax error in toexport.inc.php"
  20b01e83cb61b6b2460f64c7d1277c5f4cc28574.

Fixes #751
</content>
</entry>
<entry>
<title>Standard file header: /replicate</title>
<updated>2021-08-14T11:09:23Z</updated>
<author>
<name>Damien Regad</name>
<email>dregad@mantisbt.org</email>
</author>
<published>2021-04-30T17:28:10Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=e95cdc0d2199fbfe8010d78d30febd4cbf384da2'/>
<id>urn:sha1:e95cdc0d2199fbfe8010d78d30febd4cbf384da2</id>
<content type='text'>
</content>
</entry>
<entry>
<title>PHPDoc and camelCase for newDataDictionary</title>
<updated>2021-03-11T18:32:27Z</updated>
<author>
<name>Damien Regad</name>
<email>dregad@mantisbt.org</email>
</author>
<published>2021-03-11T18:32:27Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=92346252254a4d3fb97ec0034a0832c271b68989'/>
<id>urn:sha1:92346252254a4d3fb97ec0034a0832c271b68989</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Replace each() with foreach for PHP7.2 compatibility</title>
<updated>2017-11-25T16:46:05Z</updated>
<author>
<name>Marina Glancy</name>
<email>marina@moodle.com</email>
</author>
<published>2017-10-03T07:37:33Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=d9cc6c66ec08e5a517f8fa4503345ead992e2a62'/>
<id>urn:sha1:d9cc6c66ec08e5a517f8fa4503345ead992e2a62</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Fix#139: Remove PHP 4 Constructors</title>
<updated>2015-08-11T12:56:49Z</updated>
<author>
<name>Valentin Sheyretski</name>
<email>valio@vsite.org</email>
</author>
<published>2015-07-15T12:25:32Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=9ffa02e6ddc88dbfdfdf4437e0a398cc39960094'/>
<id>urn:sha1:9ffa02e6ddc88dbfdfdf4437e0a398cc39960094</id>
<content type='text'>
This is the original commit from @valioz, rebased on latest master

Signed-off-by: Damien Regad &lt;dregad@mantisbt.org&gt;

Conflicts:
	drivers/adodb-db2ora.inc.php
	drivers/adodb-mssqlpo.inc.php
	drivers/adodb-odbc_oracle.inc.php
</content>
</entry>
<entry>
<title>Remove closing php tag</title>
<updated>2014-02-24T15:57:38Z</updated>
<author>
<name>Damien Regad</name>
<email>dregad@mantisbt.org</email>
</author>
<published>2014-02-24T15:21:57Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=8658d9d862cda3cbe153f586f61426b5010cc38b'/>
<id>urn:sha1:8658d9d862cda3cbe153f586f61426b5010cc38b</id>
<content type='text'>
http://php.net/manual/en/language.basic-syntax.phptags.php
</content>
</entry>
<entry>
<title>Reorg: ADOdb5 (master) branch</title>
<updated>2013-08-05T11:56:24Z</updated>
<author>
<name>Damien Regad</name>
<email>dregad@mantisbt.org</email>
</author>
<published>2013-08-05T11:56:24Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=53010b5ceb548968e93c752defec085e7c508f4a'/>
<id>urn:sha1:53010b5ceb548968e93c752defec085e7c508f4a</id>
<content type='text'>
- Move all files in adodb5/ to root
- Remove adodb-for-php4/ directory
</content>
</entry>
</feed>
