aboutsummaryrefslogtreecommitdiffstats
path: root/lib/orber/vsn.mk
diff options
context:
space:
mode:
authorNiclas Eklund <[email protected]>2010-10-28 15:03:38 +0200
committerNiclas Eklund <[email protected]>2010-10-28 15:03:38 +0200
commitbed002dd4303a09c8895a8afc232a1b16874f8ab (patch)
treebe771b682ead00167a27c87d00858e002bdfb597 /lib/orber/vsn.mk
parentde0ce3407717573e9591b086a1829f16ed88d289 (diff)
parentcaa311d4a2b5fb229d9369c7667b062b34945b36 (diff)
downloadotp-bed002dd4303a09c8895a8afc232a1b16874f8ab.tar.gz
otp-bed002dd4303a09c8895a8afc232a1b16874f8ab.tar.bz2
otp-bed002dd4303a09c8895a8afc232a1b16874f8ab.zip
Merge branch 'maint-r13' into maint-r14
Conflicts: lib/cosNotification/src/CosNotification_Definitions.hrl lib/cosNotification/vsn.mk lib/orber/vsn.mk
Diffstat (limited to 'lib/orber/vsn.mk')
-rw-r--r--lib/orber/vsn.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk
index 681b82b51b..584a52ab84 100644
--- a/lib/orber/vsn.mk
+++ b/lib/orber/vsn.mk
@@ -1 +1 @@
-ORBER_VSN = 3.6.17
+ORBER_VSN = 3.6.18