the bitrig patrick_sqlite branch has been created by patrick. it is 0 commits behind master, and 5 commits ahead.
commit 56143ab319d8b735854d1b66fecdade566c9ac12 diff: https://github.com/bitrig/bitrig/commit/56143ab author: Patrick Wildt <[email protected]> date: Thu Apr 2 21:48:10 2015 +0200 sync M distrib/sets/lists/base/mi commit 20983790ece92fe58ee6c5d36175eef1b7b82333 diff: https://github.com/bitrig/bitrig/commit/2098379 author: James Turner <[email protected]> date: Mon Mar 16 00:15:04 2015 +0000 Fix typoe M lib/libsqlite3/Makefile commit 8e11e474bb02981e9b8e237d9437f9ab0c2ead7e diff: https://github.com/bitrig/bitrig/commit/8e11e47 author: James Turner <[email protected]> date: Mon Mar 16 00:12:39 2015 +0000 Bump major to 29, regen .pc and header with new version info M lib/libsqlite3/Makefile M lib/libsqlite3/shlib_version M lib/libsqlite3/sqlite3.pc M lib/libsqlite3/src/sqlite3.h M lib/libsqlite3/tsrc/pthread_stub.c commit 36e6c7b73b1b0faeed25da702b8fca8472bd2ca6 diff: https://github.com/bitrig/bitrig/commit/36e6c7b author: James Turner <[email protected]> date: Mon Mar 16 00:08:24 2015 +0000 Merge conflicts M lib/libsqlite3/src/loadext.c M lib/libsqlite3/src/os_unix.c M lib/libsqlite3/src/parse.y commit 101e1b62f54307f9a321aa2e35e4cdd3996eaa7d diff: https://github.com/bitrig/bitrig/commit/101e1b6 author: James Turner <[email protected]> date: Mon Mar 16 00:06:52 2015 +0000 Update sqlite3 to 3.8.7.4. Changes available here: http://sqlite.org/changes.html#version_3_8_7_4 ok landry@ M lib/libsqlite3/VERSION M lib/libsqlite3/ext/fts3/fts3.c M lib/libsqlite3/ext/fts3/fts3_expr.c A lib/libsqlite3/ext/misc/showauth.c M lib/libsqlite3/ext/misc/spellfix.c A lib/libsqlite3/ext/rtree/rtreeF.test A lib/libsqlite3/ext/userauth/sqlite3userauth.h A lib/libsqlite3/ext/userauth/user-auth.txt A lib/libsqlite3/ext/userauth/userauth.c M lib/libsqlite3/src/alter.c M lib/libsqlite3/src/analyze.c M lib/libsqlite3/src/attach.c M lib/libsqlite3/src/auth.c M lib/libsqlite3/src/backup.c M lib/libsqlite3/src/btmutex.c M lib/libsqlite3/src/btree.c M lib/libsqlite3/src/btree.h M lib/libsqlite3/src/btreeInt.h M lib/libsqlite3/src/build.c M lib/libsqlite3/src/callback.c M lib/libsqlite3/src/complete.c M lib/libsqlite3/src/ctime.c M lib/libsqlite3/src/date.c M lib/libsqlite3/src/delete.c M lib/libsqlite3/src/expr.c M lib/libsqlite3/src/fkey.c M lib/libsqlite3/src/func.c M lib/libsqlite3/src/global.c M lib/libsqlite3/src/hash.c M lib/libsqlite3/src/hash.h M lib/libsqlite3/src/insert.c M lib/libsqlite3/src/legacy.c M lib/libsqlite3/src/lempar.c M lib/libsqlite3/src/main.c M lib/libsqlite3/src/malloc.c M lib/libsqlite3/src/mem1.c M lib/libsqlite3/src/mem2.c M lib/libsqlite3/src/mem5.c M lib/libsqlite3/src/memjournal.c M lib/libsqlite3/src/mutex.h M lib/libsqlite3/src/mutex_w32.c M lib/libsqlite3/src/notify.c M lib/libsqlite3/src/os.h M lib/libsqlite3/src/os_win.c M lib/libsqlite3/src/os_win.h M lib/libsqlite3/src/pager.c M lib/libsqlite3/src/pcache.c M lib/libsqlite3/src/pcache.h M lib/libsqlite3/src/pcache1.c M lib/libsqlite3/src/pragma.c M lib/libsqlite3/src/prepare.c M lib/libsqlite3/src/printf.c M lib/libsqlite3/src/resolve.c M lib/libsqlite3/src/rowset.c M lib/libsqlite3/src/select.c M lib/libsqlite3/src/sqlite.h.in M lib/libsqlite3/src/sqlite3ext.h M lib/libsqlite3/src/sqliteInt.h M lib/libsqlite3/src/status.c M lib/libsqlite3/src/table.c M lib/libsqlite3/src/tclsqlite.c M lib/libsqlite3/src/test1.c M lib/libsqlite3/src/test_config.c M lib/libsqlite3/src/test_func.c M lib/libsqlite3/src/test_intarray.c M lib/libsqlite3/src/test_intarray.h M lib/libsqlite3/src/test_malloc.c M lib/libsqlite3/src/test_multiplex.c M lib/libsqlite3/src/test_schema.c A lib/libsqlite3/src/threads.c M lib/libsqlite3/src/tokenize.c M lib/libsqlite3/src/trigger.c M lib/libsqlite3/src/update.c M lib/libsqlite3/src/utf.c M lib/libsqlite3/src/util.c M lib/libsqlite3/src/vacuum.c M lib/libsqlite3/src/vdbe.c M lib/libsqlite3/src/vdbe.h M lib/libsqlite3/src/vdbeInt.h M lib/libsqlite3/src/vdbeapi.c M lib/libsqlite3/src/vdbeaux.c M lib/libsqlite3/src/vdbeblob.c M lib/libsqlite3/src/vdbemem.c M lib/libsqlite3/src/vdbesort.c M lib/libsqlite3/src/vdbetrace.c M lib/libsqlite3/src/vtab.c M lib/libsqlite3/src/wal.c M lib/libsqlite3/src/walker.c M lib/libsqlite3/src/where.c M lib/libsqlite3/src/whereInt.h M lib/libsqlite3/tool/mkautoconfamal.sh M lib/libsqlite3/tool/mkpragmatab.tcl M lib/libsqlite3/tool/mksqlite3c-noext.tcl M lib/libsqlite3/tool/mksqlite3c.tcl M lib/libsqlite3/tool/showdb.c M lib/libsqlite3/tool/showwal.c M lib/libsqlite3/tool/vdbe-compress.tcl
