diff options
| author | Niclas Eklund <[email protected]> | 2010-12-10 17:00:02 +0100 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2010-12-10 17:00:02 +0100 |
| commit | 8bd0325c850ad70e514f680a2dd7020144773665 (patch) | |
| tree | 9d8ad2b52391cb54db7fef5c84d0b519c1d48c34 /lib/orber/vsn.mk | |
| parent | 3cf40cefd44ab6383bd16319c7c6941fd0d0f13c (diff) | |
| parent | caa311d4a2b5fb229d9369c7667b062b34945b36 (diff) | |
| download | otp-8bd0325c850ad70e514f680a2dd7020144773665.tar.gz otp-8bd0325c850ad70e514f680a2dd7020144773665.tar.bz2 otp-8bd0325c850ad70e514f680a2dd7020144773665.zip | |
Merge branch 'maint-r13' of super:otp into nick/orber/recursive_types/OTP-8868
Diffstat (limited to 'lib/orber/vsn.mk')
| -rw-r--r-- | lib/orber/vsn.mk | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk index d074bfb86c..c405326e9a 100644 --- a/lib/orber/vsn.mk +++ b/lib/orber/vsn.mk @@ -1,7 +1,14 @@ -ORBER_VSN = 3.6.15 +ORBER_VSN = 3.6.18 -TICKETS = OTP-8353 \ +TICKETS = OTP-8900 + +TICKETS_3.6.17 = OTP-8840 + +TICKETS_3.6.16 = OTP-8543 \ + OTP-8489 + +TICKETS_3.6.15 = OTP-8353 \ OTP-8354 \ OTP-8374 \ OTP-8409 \ @@ -9,6 +16,8 @@ TICKETS = OTP-8353 \ TICKETS_3.6.14 = OTP-8201 +TICKETS_3.6.14 = OTP-8201 + TICKETS_3.6.13 = OTP-7987 TICKETS_3.6.12 = OTP-7906 |