dxcluster.org Git - spider.git/commit

]> dxcluster.org Git - spider.git/commit

projects / spider.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6ac264a 6d4a32b)

author	Dirk Koopman <djk@tobit.co.uk>
	Thu, 21 Jun 2007 13:54:07 +0000 (14:54 +0100)
committer	Dirk Koopman <djk@tobit.co.uk>
	Thu, 21 Jun 2007 13:54:07 +0000 (14:54 +0100)
commit	d2580480d24be5e8f1beb4aeeb40980db0dedde0
tree	353fb22543129d2d445d73be44ba12ae58de3827	tree \| snapshot
parent	6ac264a972df84ae5c0eb38ba76c68d148f36349	commit \| diff
parent	6d4a32b02d01c70c475119c3617bb42ebe1fc03a	commit \| diff

Merge branch 'SIMPLEROUTE'

and tag as 1.55

Conflicts:

.gitignore
data/.gitignore
perl/DXProt.pm
perl/Version.pm

Changes	diff1 \|	diff2 \|	blob \| history
perl/DXProt.pm	diff1 \|	diff2 \|	blob \| history
perl/DXProtHandle.pm	\|	diff2 \|	blob \| history
perl/DXProtVars.pm	diff1 \|	diff2 \|	blob \| history
perl/DXProtout.pm	diff1 \|	diff2 \|	blob \| history
perl/Route.pm	diff1 \|	diff2 \|	blob \| history
perl/Route/Node.pm	diff1 \|	diff2 \|	blob \| history
perl/Version.pm	diff1 \|	diff2 \|	blob \| history
perl/cluster.pl	diff1 \|	diff2 \|	blob \| history

The DXSpider Git Repository