projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0e89669
b2aa9a9
)
merge new wpxloc.raw + CTY2204 prefix changes
author
Dirk Koopman
<djk@tobit.co.uk>
Tue, 13 Mar 2012 18:33:11 +0000
(18:33 +0000)
committer
Dirk Koopman
<djk@tobit.co.uk>
Tue, 13 Mar 2012 18:33:11 +0000
(18:33 +0000)
Conflicts:
perl/Version.pm
1
2
perl/Version.pm
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
perl/Version.pm
index 527a4f05a47261000f1643f3db5e0b150cfbe98f,5b4df4f54087b45d0802e59b15a0fd3332fc8388..576b4ad843f97bee95c7bcb09d28301cb637500b
---
1
/
perl/Version.pm
---
2
/
perl/Version.pm
+++ b/
perl/Version.pm
@@@
-9,9
-9,9
+9,9
@@@
package main
use vars qw($version $subversion $build $gitversion);
-$version = '1.5
5
';
+$version = '1.5
6
';
$subversion = '0';
- $build = '31';
- $gitversion = '4e42369';
-$build = '111';
-$gitversion = '427bd01';
++$build = '36';
++$gitversion = '0e89669';
1;