Alex 2e462e04d5 Resolve conflicts ...

All "confilcts" were actually diffs - not sure why git flew off the
handle.

2013-01-12 14:27:50 -06:00

..

include/Poco/Data/SQLite

fixed and improved thread mode set/test

2012-12-23 15:27:32 -06:00

src

Resolve conflicts

2013-01-12 14:27:50 -06:00

testsuite

fixed and improved thread mode set/test

2012-12-23 15:27:32 -06:00

CMakeLists.txt

Fixed build with CMake

2012-12-08 15:54:38 -02:00

dependencies

new trunk (base for 1.5)

2012-04-23 01:14:34 +00:00

Makefile

minor Data fixes

2012-04-24 02:10:19 +00:00

SQLite_CE_vs90.sln

fixed text files

2012-11-11 13:56:24 +01:00

SQLite_CE_vs90.vcproj

fixed text files

2012-11-11 13:56:24 +01:00

SQLite_vs100.sln

- change PocoODBC (SQLite, MySQL) to PocoDataODBC (SQLite, MySQL)

2012-06-25 00:48:59 +00:00

SQLite_vs100.vcxproj

more new and modified build files

2012-06-25 02:13:06 +00:00

SQLite_vs100.vcxproj.filters

more new and modified build files

2012-06-25 02:13:06 +00:00

SQLite_vs110.sln

fixed text files

2012-11-11 13:56:24 +01:00

SQLite_vs110.vcxproj

fixed text files

2012-11-11 13:56:24 +01:00

SQLite_vs110.vcxproj.filters

fixed text files

2012-11-11 13:56:24 +01:00

SQLite_VS71.sln

- change PocoODBC (SQLite, MySQL) to PocoDataODBC (SQLite, MySQL)

2012-06-25 00:48:59 +00:00

SQLite_VS71.vcproj

- change PocoODBC (SQLite, MySQL) to PocoDataODBC (SQLite, MySQL)

2012-06-25 00:48:59 +00:00

SQLite_VS80.sln

- change PocoODBC (SQLite, MySQL) to PocoDataODBC (SQLite, MySQL)

2012-06-25 00:48:59 +00:00

SQLite_VS80.vcproj

- change PocoODBC (SQLite, MySQL) to PocoDataODBC (SQLite, MySQL)

2012-06-25 00:48:59 +00:00

SQLite_VS90.sln

- change PocoODBC (SQLite, MySQL) to PocoDataODBC (SQLite, MySQL)

2012-06-25 00:48:59 +00:00

SQLite_VS90.vcproj

- change PocoODBC (SQLite, MySQL) to PocoDataODBC (SQLite, MySQL)

2012-06-25 00:48:59 +00:00

SQLite_x64_vs110.sln

fixed text files

2012-11-11 13:56:24 +01:00

SQLite_x64_vs110.vcxproj

fixed text files

2012-11-11 13:56:24 +01:00

SQLite_x64_vs110.vcxproj.filters

fixed text files

2012-11-11 13:56:24 +01:00

SQLite.progen

change EOL to 'native'

2012-04-29 18:52:25 +00:00