From 7fcff90eaa2e260559397d733ec243b12f1cbf48 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 2 Oct 2010 15:30:41 +0000 Subject: [PATCH] 2010-10-02 [colin] 3.7.6cvs46 * configure.ac Forgot to remove the directory from top-level --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 3 +-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a34321868..53144b940 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-10-02 [colin] 3.7.6cvs46 + + * configure.ac + Forgot to remove the directory from top-level + 2010-10-02 [colin] 3.7.6cvs45 * src/plugins/trayicon/Makefile.am diff --git a/PATCHSETS b/PATCHSETS index 3dbd52f64..d9602f66f 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4041,3 +4041,4 @@ ( cvs diff -u -r 1.654.2.4111 -r 1.654.2.4112 configure.ac; ) > 3.7.6cvs43.patchset ( cvs diff -u -r 1.12.2.59 -r 1.12.2.60 src/action.c; cvs diff -u -r 1.27.2.47 -r 1.27.2.48 src/addr_compl.c; cvs diff -u -r 1.60.2.137 -r 1.60.2.138 src/addressbook.c; cvs diff -u -r 1.5.10.31 -r 1.5.10.32 src/addrgather.c; cvs diff -u -r 1.17.2.40 -r 1.17.2.41 src/alertpanel.c; cvs diff -u -r 1.14.2.56 -r 1.14.2.57 src/editaddress.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/editaddress_other_attributes_ldap.c; cvs diff -u -r 1.11.2.24 -r 1.11.2.25 src/editgroup.c; cvs diff -u -r 1.207.2.216 -r 1.207.2.217 src/folderview.c; cvs diff -u -r 1.14.2.26 -r 1.14.2.27 src/grouplistdialog.c; cvs diff -u -r 1.8.2.31 -r 1.8.2.32 src/headerview.c; cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/image_viewer.c; cvs diff -u -r 1.14.2.24 -r 1.14.2.25 src/importldif.c; cvs diff -u -r 1.115.2.229 -r 1.115.2.230 src/main.c; cvs diff -u -r 1.274.2.317 -r 1.274.2.318 src/mainwindow.c; cvs diff -u -r 1.3.12.33 -r 1.3.12.34 src/message_search.c; cvs diff -u -r 1.83.2.163 -r 1.83.2.164 src/mimeview.c; cvs diff -u -r 1.3.2.64 -r 1.3.2.65 src/prefs_themes.c; cvs diff -u -r 1.15.2.58 -r 1.15.2.59 src/summary_search.c; cvs diff -u -r 1.395.2.424 -r 1.395.2.425 src/summaryview.c; cvs diff -u -r 1.43.2.119 -r 1.43.2.120 src/toolbar.c; cvs diff -u -r 1.1.4.111 -r 1.1.4.112 src/etpan/imap-thread.c; cvs diff -u -r 1.1.2.68 -r 1.1.2.69 src/gtk/authors.h; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/gtk/gtkcmclist.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/gtkcmoptionmenu.c; cvs diff -u -r 1.5.2.90 -r 1.5.2.91 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.49 -r 1.4.2.50 src/gtk/gtkutils.h; cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/gtk/gtkvscrollbutton.c; cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/plugins/pgpcore/select-keys.c; cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c; ) > 3.7.6cvs44.patchset ( cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/plugins/trayicon/Makefile.am; cvs diff -u -r 1.14.2.71 -r 1.14.2.72 src/plugins/trayicon/trayicon.c; cvs diff -u -r -1.1 -r -1.2 src/plugins/trayicon/libeggtrayicon/.cvsignore; cvs diff -u -r -1.2.2.3 -r -1.2.2.4 src/plugins/trayicon/libeggtrayicon/Makefile.am; cvs diff -u -r -1.1.4.12 -r -1.1.4.13 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c; cvs diff -u -r -1.1.4.3 -r -1.1.4.4 src/plugins/trayicon/libeggtrayicon/eggtrayicon.h; cvs diff -u -r -1.1.4.1 -r -1.1.4.2 src/plugins/trayicon/libeggtrayicon/gtk2-funcs.c; cvs diff -u -r -1.1.4.1 -r -1.1.4.2 src/plugins/trayicon/libeggtrayicon/gtk2-funcs.h; cvs diff -u -r -1.1.4.5 -r -1.1.4.6 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c; cvs diff -u -r -1.1.4.2 -r -1.1.4.3 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.h; cvs diff -u -r -1.1 -r -1.2 src/plugins/trayicon/libeggtrayicon/xembed.h; ) > 3.7.6cvs45.patchset +( cvs diff -u -r 1.654.2.4114 -r 1.654.2.4115 configure.ac; ) > 3.7.6cvs46.patchset diff --git a/configure.ac b/configure.ac index 35df9a546..9cb0ff86b 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=6 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=45 +EXTRA_VERSION=46 EXTRA_RELEASE= EXTRA_GTK2_VERSION= @@ -1027,7 +1027,6 @@ src/plugins/bogofilter/Makefile src/plugins/spamassassin/Makefile src/plugins/dillo_viewer/Makefile src/plugins/trayicon/Makefile -src/plugins/trayicon/libeggtrayicon/Makefile src/plugins/pgpcore/Makefile src/plugins/pgpmime/Makefile src/plugins/pgpinline/Makefile -- 2.25.1