projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4e42369
427bd01
)
Merge branch 'master' into anyevent
author
Dirk Koopman
<djk@tobit.co.uk>
Mon, 12 Mar 2012 23:44:36 +0000
(23:44 +0000)
committer
Dirk Koopman
<djk@tobit.co.uk>
Mon, 12 Mar 2012 23:44:36 +0000
(23:44 +0000)
Conflicts:
perl/DXUser.pm
perl/Version.pm
Add database handling changes from master
1
2
perl/Version.pm
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
perl/Version.pm
index 8942c46c43d5ca88d786bd2ef44f4f3ca95fbd0b,2e78796b8f219d662ab051b70513d9e70e2d964f..527a4f05a47261000f1643f3db5e0b150cfbe98f
---
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 = '30';
- $gitversion = '899ab26';
-$build = '110';
-$gitversion = '61885d0';
++$build = '31';
++$gitversion = '4e42369';
1;