From 068c6989def054648b32c315b102a6a07594b1c0 Mon Sep 17 00:00:00 2001
From: Zantox <jyoerger10@msn.com>
Date: Thu, 27 Mar 2014 06:51:51 -0400
Subject: Small Grammar Fix

---
 include/language.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/language.h b/include/language.h
index 041f90b11..a1b5c347d 100644
--- a/include/language.h
+++ b/include/language.h
@@ -107,7 +107,7 @@ namespace Language
 #define CHAN_SETTING_UNSET		_("%s for %s unset.")
 #define CHAN_ACCESS_LEVEL_RANGE		_("Access level must be between %d and %d inclusive.")
 #define CHAN_INFO_HEADER		_("Information for channel \002%s\002:")
-#define CHAN_EXCEPTED			_("\002%s\002 matches an except on %s and cannot be banned until the except have been removed.")
+#define CHAN_EXCEPTED			_("\002%s\002 matches an except on %s and cannot be banned until the except has been removed.")
 #define MEMO_NEW_X_MEMO_ARRIVED		_("There is a new memo on channel %s.\n" \
 						"Type \002%s%s READ %s %d\002 to read it.")
 #define MEMO_NEW_MEMO_ARRIVED		_("You have a new memo from %s.\n" \
-- 
cgit 


From 43219d3906a6a1b980319ae993c53f7606e438a6 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sun, 6 Apr 2014 23:01:10 -0400
Subject: Do not apply module changes on rehash until after the new config has
 been applied. Fix renaming opertypes on reload.

---
 include/config.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/config.h b/include/config.h
index 308775e41..86a7dce78 100644
--- a/include/config.h
+++ b/include/config.h
@@ -132,6 +132,7 @@ namespace Configuration
 		~Conf();
 
 		void LoadConf(File &file);
+		void Post(Conf *old);
 
 		Block *GetModule(Module *);
 		Block *GetModule(const Anope::string &name);
-- 
cgit 


From c1c45a5db9ba52111978f69eea8a6823ee467459 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Mon, 7 Apr 2014 15:28:07 -0400
Subject: Do not clear all extension items tied to objects when unserializing.
 Instead, pass the old object to the unserialization functions and let them
 incrementally update the object.

---
 include/extensible.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'include')

diff --git a/include/extensible.h b/include/extensible.h
index f33312393..2a852ff47 100644
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -176,6 +176,8 @@ class SerializableExtensibleItem : public PrimitiveExtensibleItem<T>
 		T t;
 		if (data[this->name] >> t)
 			this->Set(e, t);
+		else
+			this->Unset(e);
 	}
 };
 
@@ -196,6 +198,8 @@ class SerializableExtensibleItem<bool> : public PrimitiveExtensibleItem<bool>
 		data[this->name] >> b;
 		if (b)
 			this->Set(e);
+		else
+			this->Unset(e);
 	}
 };
 
-- 
cgit