merge for backout
authorShawn Wilsher <sdwilsh@shawnwilsher.com>
Tue, 19 May 2009 16:46:41 -0400
changeset 28602 cc61db43d4457d00f46ba0980cd41d9408069679
parent 28600 440707c4cc9b55dc944e53e0aa0d3d22f54193e3 (current diff)
parent 28601 e54a1c608d8cb0e3a801b9928c6b8bb7b7080cca (diff)
child 28603 2359edf260bf45376078dbf8b95ae5f40544d187
push id7136
push usersdwilsh@shawnwilsher.com
push dateTue, 19 May 2009 20:47:31 +0000
treeherdermozilla-central@cc61db43d445 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.2a1pre
merge for backout
--- a/configure.in
+++ b/configure.in
@@ -125,17 +125,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
 LIBGNOME_VERSION=2.0
 STARTUP_NOTIFICATION_VERSION=0.8
 DBUS_VERSION=0.60
-SQLITE_VERSION=3.6.14.1
+SQLITE_VERSION=3.6.10
 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.6.14.1
+This is sqlite 3.6.10
 
--- Shawn Wilsher <me@shawnwilsher.com>, 5/2009
+-- Shawn Wilsher <me@shawnwilsher.com>, 2/2009
 
 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: