From a84d971d06b0d25b02d75bde96916baffe29ec59 Mon Sep 17 00:00:00 2001
From: mcrane <mctch@yahoo.com>
Date: Wed, 23 Dec 2009 16:11:04 -0700
Subject: Fix commit conflict.

---
 pkg_config.7.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'pkg_config.7.xml')

diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 24c5499b..359975e6 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -19,7 +19,7 @@
 		<descr>The Reliable, High Performance TCP/HTTP Load Balancer</descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>0.20</version>
+		<version>0.21</version>
 		<status>BETA</status>
 		<required_version>1.2.3</required_version>
 		<config_file>http://www.pfsense.com/packages/config/haproxy/haproxy.xml</config_file>
@@ -433,11 +433,12 @@
     <package>
       <name>Fit123</name>
       <website>http://pfsense.comuf.com</website>
-      <descr>With Fit123 a small set of features can be added to pfSense 1.2.3 (Date)Adds current date to front page (LTSP)Adds 3th network boot option (After Filter Change) Clear states after filter reload (DNS Servers)Adds option for a 3th and 4th DNS Server (DDNS)A more customize way to update dynamic dns (Themes)On install Code-red and the pfsense ng theme are added to the list of avalible themes.</descr>
+      <descr>With Fit123 a small set of features can be added to pfSense 1.2.3 (Date)Adds current date to front page (LTSP)Adds 3th network boot option (After Filter Change) Clear states after filter reload (DNS Servers)Adds option for a 3th and 4th DNS Server (DDNS)A more customize way to update dynamic dns (CASS) Clear states for 1 voip client after dynamic ip update on wan.</descr>
       <category>System</category>
-      <version>0.0.5</version>
-      <status>ALPHA</status>
+      <version>1.0</version>
+      <status>Stable</status>
       <required_version>1.2.3</required_version>
+      <maximum_version>1.2.3</maximum_version>
       <maintainer>crazypark2@yahoo.dk</maintainer>
       <config_file>http://www.pfsense.com/packages/config/Fit123/fit123.xml</config_file>
       <configurationfile>fit123.xml</configurationfile>
-- 
cgit v1.2.3