aboutsummaryrefslogtreecommitdiffstats
path: root/lib/orber/vsn.mk
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2013-03-21 14:57:34 +0100
committerLars Thorsen <[email protected]>2013-03-21 14:57:34 +0100
commit9e69870e67b06ee1ec83ba8c81de7c7d88bf790f (patch)
tree7a32be1e4cc8de9deaa47ae92b406887c48f791d /lib/orber/vsn.mk
parente173bc1b28453f0edb4863677f3c730b3d7a9f91 (diff)
parent98bad864871eada14c948d27be9998bed36e2f50 (diff)
downloadotp-9e69870e67b06ee1ec83ba8c81de7c7d88bf790f.tar.gz
otp-9e69870e67b06ee1ec83ba8c81de7c7d88bf790f.tar.bz2
otp-9e69870e67b06ee1ec83ba8c81de7c7d88bf790f.zip
Merge branch 'maint-r15' into lars/orber/corbaloc-bug-r16-version/OTP-10675
* maint-r15: [orber] Fix bug in corbaloc/corbaname over ssl
Diffstat (limited to 'lib/orber/vsn.mk')
-rw-r--r--lib/orber/vsn.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk
index 10b19477e0..4e09532f88 100644
--- a/lib/orber/vsn.mk
+++ b/lib/orber/vsn.mk
@@ -1,3 +1,2 @@
-
-ORBER_VSN = 3.6.25
+ORBER_VSN = 3.6.26