Merge branch 'master' into SIMPLEROUTE
authorDirk Koopman <djk@tobit.co.uk>
Thu, 14 Jun 2007 15:16:43 +0000 (16:16 +0100)
committerDirk Koopman <djk@tobit.co.uk>
Thu, 14 Jun 2007 15:16:43 +0000 (16:16 +0100)
commit776d7bb9277c9d24708e297f240395b51b0aaa93
tree54772373b02bc1a80c4fbf90aa9cd1c84b0c200d
parent7b9256ceade8b18b48f848c9ac659c2de7322b0b
parent88332ba1956540f080839d8c1dbd350bf696370c
Merge branch 'master' into SIMPLEROUTE

Conflicts:

Changes
cmd/Aliases
perl/DXChannel.pm
perl/DXProt.pm
perl/DXSql/SQLite.pm
perl/DXSql/mysql.pm
perl/DXXml.pm
perl/DXXml/Cmd.pm
perl/DXXml/IM.pm
perl/DXXml/Text.pm
perl/Msg.pm
perl/Route/Node.pm
perl/Version.pm

fix conflicts from merge
Changes
data/.gitignore
perl/DXChannel.pm
perl/Version.pm
perl/cluster.pl