Stephen Lombardo
|
e94562c698
|
fix malformed man caused by old merge conflict
|
2024-04-11 16:07:58 -04:00 |
|
Stephen Lombardo
|
884e09d9e6
|
Merge sqlite-release(3.43.0) into prerelease-integration
|
2023-09-01 12:54:55 -04:00 |
|
Nick Parker
|
edf2c86154
|
Merge sqlite-release(3.8.8.3) into prerelease-integration
|
2015-03-20 09:37:39 -05:00 |
|
Nick Parker
|
82db0d7e90
|
Merge sqlite-release(3.8.4.3) into prerelease-integration
Conflicts:
Makefile.in
README
VERSION
configure
manifest
manifest.uuid
sqlcipher.1
src/pragma.c
src/shell.c
|
2014-04-04 13:16:23 -05:00 |
|
Stephen Lombardo
|
226e79762e
|
merge debian patch
|
2013-01-09 21:14:37 -05:00 |
|