summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@src.gnome.org>2004-06-03 18:51:32 +0000
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-06-03 18:51:32 +0000
commitb774b547788b74884b9eb690c548a6016e714023 (patch)
tree72b9df09c0fc257169b3e9b9cbdc349e56a63101 /ChangeLog
parentb699b40d663955560655271f7645ae277e6076c8 (diff)
downloadepiphany-b774b547788b74884b9eb690c548a6016e714023.tar.gz
merge mozilla-embed-strings branch
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog41
1 files changed, 41 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6edfbc7af..c1e65ebeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+2004-06-03 Marco Pesenti Gritti <marco@gnome.org>
+
+ * configure.in:
+ * embed/ephy-embed.c: (ephy_embed_base_init),
+ (ephy_embed_set_zoom):
+ * embed/ephy-embed.h:
+ * embed/mozilla/ContentHandler.cpp:
+ * embed/mozilla/ContentHandler.h:
+ * embed/mozilla/EphyAboutRedirector.cpp:
+ * embed/mozilla/EphyBrowser.cpp:
+ * embed/mozilla/EphyBrowser.h:
+ * embed/mozilla/EphyContentPolicy.cpp:
+ * embed/mozilla/EphyHeaderSniffer.cpp:
+ * embed/mozilla/EphyHeaderSniffer.h:
+ * embed/mozilla/EphySingle.cpp:
+ * embed/mozilla/EphyUtils.cpp:
+ * embed/mozilla/EphyUtils.h:
+ * embed/mozilla/EventContext.cpp:
+ * embed/mozilla/EventContext.h:
+ * embed/mozilla/FilePicker.cpp:
+ * embed/mozilla/GlobalHistory.cpp:
+ * embed/mozilla/GlobalHistory.h:
+ * embed/mozilla/GtkNSSClientAuthDialogs.cpp:
+ * embed/mozilla/GtkNSSDialogs.cpp:
+ * embed/mozilla/GtkNSSKeyPairDialogs.cpp:
+ * embed/mozilla/Makefile.am:
+ * embed/mozilla/MozDownload.cpp:
+ * embed/mozilla/MozDownload.h:
+ * embed/mozilla/MozRegisterComponents.cpp:
+ * embed/mozilla/MozillaPrivate.cpp:
+ * embed/mozilla/mozilla-download.cpp:
+ * embed/mozilla/mozilla-embed-persist.cpp:
+ * embed/mozilla/mozilla-embed-single.cpp:
+ * embed/mozilla/mozilla-embed.cpp:
+ * embed/mozilla/mozilla-version.h:
+ * src/ephy-tab.c: (ephy_tab_address_cb),
+ (ephy_tab_content_change_cb), (ephy_tab_init):
+ * src/ephy-window.c: (ephy_window_set_zoom):
+
+ Merge mozilla-embed-strings branch
+
2004-06-02 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-window.c: (update_exit_fullscreen_popup_position):