From: Dirk Koopman <djk@tobit.co.uk>
Date: Fri, 4 Nov 2011 18:06:34 +0000 (+0000)
Subject: Merge branch 'master' of ssh://server/scm/spider
X-Git-Tag: 1.56~5
X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=842017697fd6bef2bfb51b71c846f5d0fd69d734;hp=9bbfe9a2d39e3b61fac38089159b6a0808f5b3d2;p=spider.git

Merge branch 'master' of ssh://server/scm/spider

Conflicts:
	Changes
	data/cty.dat
	data/prefix_data.pl
---

diff --git a/Changes b/Changes
index b9671d0a..21146369 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
-02Oct11=======================================================================
+04Nov11=======================================================================
 1. Add CTY2115 changes
+20Oct11=======================================================================
+1. Add CTY2113 Changes
 02Oct11=======================================================================
 1. change 40m bandplan after some input from Martin, ik2rmz
 2. Add CTY2112 changes
diff --git a/perl/Version.pm b/perl/Version.pm
index d32b1723..985314d5 100644
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,7 +11,7 @@ use vars qw($version $subversion $build $gitversion);
 
 $version = '1.55';
 $subversion = '0';
-$build = '94';
-$gitversion = '6262a02';
+$build = '95';
+$gitversion = '9bbfe9a';
 
 1;