[pan2: 47/68] Merge branch 'bug403797' into integration
- From: Petr Kovář <pmkovar src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2: 47/68] Merge branch 'bug403797' into integration
- Date: Tue, 8 Feb 2011 23:01:58 +0000 (UTC)
commit 6e5a34085fd913bcaed68f4b18ac2aa8c4b854df
Merge: 49ab5c6 09e33d0
Author: K. Haley <haleykd users sf net>
Date: Fri Aug 6 17:02:09 2010 -0600
Merge branch 'bug403797' into integration
pan/gui/save-ui.cc | 28 +++++++++++-
pan/usenet-utils/text-massager-test.cc | 73 ++++++++++++++++++++++++++++++++
pan/usenet-utils/text-massager.cc | 71 +++++++++++++++++++++++++++++++
pan/usenet-utils/text-massager.h | 8 ++++
4 files changed, 178 insertions(+), 2 deletions(-)
---
diff --cc pan/usenet-utils/text-massager.cc
index f932d5b,30203a7..e81f6b0
--- a/pan/usenet-utils/text-massager.cc
+++ b/pan/usenet-utils/text-massager.cc
@@@ -19,7 -19,7 +19,8 @@@
#include <config.h>
#include <vector>
+#include <cstring>
+ #include <glib.h>
extern "C" {
#include <glib/gi18n.h>
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]