From: Dirk Koopman <djk@tobit.co.uk>
Date: Tue, 13 Mar 2012 18:33:11 +0000 (+0000)
Subject: merge new wpxloc.raw + CTY2204 prefix changes
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e603d1e166664bd67b563b4cb29ac699901dcb65;p=spider.git

merge new wpxloc.raw + CTY2204 prefix changes

Conflicts:
	perl/Version.pm
---

e603d1e166664bd67b563b4cb29ac699901dcb65
diff --cc perl/Version.pm
index 527a4f05,5b4df4f5..576b4ad8
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@@ -9,9 -9,9 +9,9 @@@ package main
  
  use vars qw($version $subversion $build $gitversion);
  
 -$version = '1.55';
 +$version = '1.56';
  $subversion = '0';
- $build = '31';
- $gitversion = '4e42369';
 -$build = '111';
 -$gitversion = '427bd01';
++$build = '36';
++$gitversion = '0e89669';
  
  1;