merge after backing out Bug 581000.
authorDaniel Holbert <dholbert@cs.stanford.edu>
Mon, 16 Aug 2010 18:55:06 -0700
changeset 50707 a9b21fa2b7ab63d40f4f15d4ba4b3ee8a2588613
parent 50705 bf982bac3ccd1668a697c72d6452b5d2fdd5b57d (current diff)
parent 50706 f069efb502f6af48aceea9cfa0a131c45c830c49 (diff)
child 50708 3a8430b73a91dfbd95ced9877729cbc8901589b6
push idunknown
push userunknown
push dateunknown
bugs581000
milestone2.0b4pre
merge after backing out Bug 581000.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -126,17 +126,17 @@ GTK2_VERSION=2.10.0
 WINDRES_VERSION=2.14.90
 W32API_VERSION=3.8
 GNOMEVFS_VERSION=2.0
 GNOMEUI_VERSION=2.2.0
 GCONF_VERSION=1.2.1
 GIO_VERSION=2.0
 STARTUP_NOTIFICATION_VERSION=0.8
 DBUS_VERSION=0.60
-SQLITE_VERSION=3.7.0.1
+SQLITE_VERSION=3.6.23.1
 LIBNOTIFY_VERSION=0.4
 
 MSMANIFEST_TOOL=
 
 dnl Set various checks
 dnl ========================================================
 MISSING_X=
 AC_PROG_AWK
--- a/db/sqlite3/README.MOZILLA
+++ b/db/sqlite3/README.MOZILLA
@@ -1,11 +1,11 @@
-This is sqlite 3.7.0.1
+This is sqlite 3.6.23.1
 
--- Shawn Wilsher <me@shawnwilsher.com>, 08/2010
+-- Shawn Wilsher <me@shawnwilsher.com>, 03/2010
 
 See http://www.sqlite.org/ for more info.
 
 We have a mozilla-specific Makefile.in in src/ (normally no
 Makefile.in there) that we use to build.
 
 To move to a new version: