| commit | 13f1f326c0f8afc189dd7f0f2f24933f5cea000b | |
| author | Przemyslaw Pawelczyk <przemoc@gmail.com> | |
| Mon, 11 May 2009 11:36:22 +0000 (11 13:36 +0200) | ||
| committer | Przemyslaw Pawelczyk <przemoc@gmail.com> | |
| Mon, 11 May 2009 12:47:24 +0000 (11 14:47 +0200) | ||
| tree | d8cf6b3cf12a49e6c03e0de6d2c4d58f361fff2e | treesnapshot (tar.gz zip) |
| parent | d7f54122880279a8974ec661935e3ce35e4728d1 | commitdiff |
| parent | 7e145badd2294172b9172ce7a7b40bc660d65f4f | commitdiff |
Merge branch 'master' into 2.3beta-2.5beta
Conflicts:
Makefile.in
aclocal.m4
build.ksh
configure
csqlinstall.ksh
examples/odbc/Makefile
examples/sqlapi/Makefile
include/Makefile.in
include/Mutex.h
include/Parser.h
src/Makefile.am
src/Makefile.in
src/adapter/Makefile.in
src/cache/Makefile.am
src/cache/Makefile.in
src/gateway/Makefile.in
src/jdbc/Makefile.in
src/network/Makefile.in
src/oci/Makefile.in
src/odbc/Makefile
src/odbc/Makefile.am
src/odbc/Makefile.in
src/sql/Makefile.in
src/sql/Parser.h
src/sql/dmlyacc.h
src/sqllog/Makefile.in
src/sqlnetwork/Makefile.in
src/storage/Makefile.in
src/tools/Makefile.am
src/tools/Makefile.in
A few changes between 2.3 beta and 2.5 beta are simply my changes,
unfortunately without a proper notice.
Conflicts:
Makefile.in
aclocal.m4
build.ksh
configure
csqlinstall.ksh
examples/odbc/Makefile
examples/sqlapi/Makefile
include/Makefile.in
include/Mutex.h
include/Parser.h
src/Makefile.am
src/Makefile.in
src/adapter/Makefile.in
src/cache/Makefile.am
src/cache/Makefile.in
src/gateway/Makefile.in
src/jdbc/Makefile.in
src/network/Makefile.in
src/oci/Makefile.in
src/odbc/Makefile
src/odbc/Makefile.am
src/odbc/Makefile.in
src/sql/Makefile.in
src/sql/Parser.h
src/sql/dmlyacc.h
src/sqllog/Makefile.in
src/sqlnetwork/Makefile.in
src/storage/Makefile.in
src/tools/Makefile.am
src/tools/Makefile.in
A few changes between 2.3 beta and 2.5 beta are simply my changes,
unfortunately without a proper notice.