From: B.Greenham <redacted>
Date: Mon, 11 Oct 2010 15:58:39 +0000 (-0400)
Subject: Merge.
X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/commitdiff_plain/40232936744bba4ca2e347dc8cafeb36f30bb35b

Merge.
---

40232936744bba4ca2e347dc8cafeb36f30bb35b
diff --cc src/newconf.c
index a48f639,6667109..40ef4ec
--- a/src/newconf.c
+++ b/src/newconf.c
@@@ -2283,9 -2285,9 +2285,10 @@@ static struct ConfEntry conf_channel_ta
  	{ "use_except",		CF_YESNO, NULL, 0, &ConfigChannel.use_except		},
  	{ "use_invex",		CF_YESNO, NULL, 0, &ConfigChannel.use_invex		},
  	{ "use_knock",		CF_YESNO, NULL, 0, &ConfigChannel.use_knock		},
 +	{ "use_forward",	CF_YESNO, NULL, 0, &ConfigChannel.use_forward		},
  	{ "use_local_channels",	CF_YESNO, NULL, 0, &ConfigChannel.use_local_channels	},
  	{ "resv_forcepart",     CF_YESNO, NULL, 0, &ConfigChannel.resv_forcepart	},
+ 	{ "channel_target_change", CF_YESNO, NULL, 0, &ConfigChannel.channel_target_change  },
  	{ "exempt_cmode_c",	CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_c	},
  	{ "exempt_cmode_C",	CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_C	},
  	{ "exempt_cmode_D",	CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_D	},