From: Dirk Koopman <djk@tobit.co.uk>
Date: Wed, 3 Mar 2010 14:50:44 +0000 (+0000)
Subject: Merge commit '64461bf14f8ce1a'
X-Git-Tag: 1.56~39
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=cf3be2ab23c544fdb17d40cbff47f8a6631e9fdb;p=spider.git

Merge commit '64461bf14f8ce1a'

merge in 500khz changes

Conflicts:

	Changes
	perl/Version.pm
---

cf3be2ab23c544fdb17d40cbff47f8a6631e9fdb
diff --cc Changes
index 38786521,252d316d..3ae1e065
--- a/Changes
+++ b/Changes
@@@ -1,5 -1,6 +1,10 @@@
++03Mar10=======================================================================
++1. add IP addresses to connecting PC92 A addresses and log them
+ 27Nov09=======================================================================
+ 1. Add 500khz band as suggested by Béla, HA5DI.
+ 2. Add CTY-1923 prefixes
 +26Nov09=======================================================================
 +1. add ip address to PC92 A records
  25Nov09=======================================================================
  1. Change sh/qrz to use the xml interface. You will have to subscribe to
  the xml interface - see http://www.qrz.com/XML/index.html for more info.
diff --cc perl/Version.pm
index 8b2a022e,55bcb950..55e38233
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@@ -9,8 -9,8 +9,8 @@@ package main
  
  use vars qw($version $subversion $build);
  
 -$version = '1.55';
 +$version = '';
  $subversion = '0';
- $build = '57';
 -$build = '55';
++$build = '1';
  
  1;