Merge branch 'master' into ditto

2010-09-03 07:46:08 -04:00 · 2010-09-03 07:46:08 -04:00 · 470960072c
commit 470960072c
parent 3496247069 680e30f229
1 changed files with 1 additions and 1 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -191,7 +191,7 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
         table.lo tokenize.lo trigger.lo \
         update.lo util.lo vacuum.lo \
         vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbetrace.lo \
-         wal.lo walker.lo where.lo utf.o vtab.lo $(CRYPTOLIBOBJ)
+         wal.lo walker.lo where.lo utf.lo vtab.lo $(CRYPTOLIBOBJ)

 # Object files for the amalgamation.
 #