summaryrefslogtreecommitdiff
path: root/lang/adodb-cn.inc.php
AgeCommit message (Collapse)AuthorFilesLines
2021-08-17Redo Merge branch 'hotfix/5.21' Standardized file headersDamien Regad1-2/+21
Try to do it right this time... # Conflicts: # adodb-memcache.lib.inc.php Fixes #751
2021-08-17Revert changes since Standardized file headers mergeDamien Regad1-21/+2
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
2021-08-14Standard file header: /langDamien Regad1-2/+21
2014-08-25Convert file adodb-cn.inc.php from GB2312 to UTF-8Marc-Etienne Vargenau1-28/+27
2014-08-07Convert files from ISO-8859-1 encoding to UTF-8Damien Regad1-27/+27
Fixes #32
2014-02-24Remove closing php tagDamien Regad1-1/+0
http://php.net/manual/en/language.basic-syntax.phptags.php
2013-08-05Reorg: ADOdb5 (master) branchDamien Regad1-0/+35
- Move all files in adodb5/ to root - Remove adodb-for-php4/ directory