diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-08-29 10:36:58 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-08-29 10:36:58 +0400 |
| commit | ac19054b5825e461e468af015cb315a4f3714354 (patch) | |
| tree | 829bfde30351d488746f83fd521be44758006cba /ext/sqlite3/php_sqlite3.h | |
| parent | af1225d692046f86b2a636b06bf7ebccfde45201 (diff) | |
| parent | 4eb6c8234dd6085e3c96a5ebca86b1d70ac481e3 (diff) | |
| download | php-ac19054b5825e461e468af015cb315a4f3714354.tar.gz | |
Merge branch 'master-5.6' of git://anonscm.debian.org/pkg-php/php
Conflicts:
debian/changelog
debian/control
debian/patches/series
debian/php5-fpm.logrotate
debian/rules
Diffstat (limited to 'ext/sqlite3/php_sqlite3.h')
| -rw-r--r-- | ext/sqlite3/php_sqlite3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/sqlite3/php_sqlite3.h b/ext/sqlite3/php_sqlite3.h index b558f7034..2c19b9d9c 100644 --- a/ext/sqlite3/php_sqlite3.h +++ b/ext/sqlite3/php_sqlite3.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | |