aboutsummaryrefslogtreecommitdiffstats
path: root/lib/hipe/vsn.mk
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-12-10 10:23:51 +0100
committerMarcus Arendt <[email protected]>2014-12-10 10:23:51 +0100
commit74ffce8cece28b9478dbace16346609e233cff70 (patch)
treed8b596ee27b00d7a4a8d506029761cc2c384c22d /lib/hipe/vsn.mk
parent991dde7fd102cffde9f164e5f80ca0555236a5fd (diff)
parentaf87b1c3d4897840d8247589a88d3611106ecedc (diff)
downloadotp-74ffce8cece28b9478dbace16346609e233cff70.tar.gz
otp-74ffce8cece28b9478dbace16346609e233cff70.tar.bz2
otp-74ffce8cece28b9478dbace16346609e233cff70.zip
Merge tag 'OTP-17.4'
=== OTP-17.4 === Changed Applications: - asn1-3.0.3 - common_test-1.9 - compiler-5.0.3 - crypto-3.4.2 - debugger-4.0.2 - dialyzer-2.7.3 - diameter-1.8 - edoc-0.7.16 - eldap-1.1 - erl_docgen-0.3.7 - erl_interface-3.7.20 - erts-6.3 - eunit-2.2.9 - hipe-3.11.2 - inets-5.10.4 - jinterface-1.5.12 - kernel-3.1 - megaco-3.17.3 - mnesia-4.12.4 - observer-2.0.3 - odbc-2.10.22 - otp_mibs-1.0.10 - parsetools-2.0.12 - percept-0.8.10 - runtime_tools-1.8.15 - snmp-5.1.1 - ssh-3.1 - ssl-5.3.8 - stdlib-2.3 - syntax_tools-1.6.17 - test_server-3.7.2 - tools-2.7.1 - wx-1.3.2 Unchanged Applications: - cosEvent-2.1.15 - cosEventDomain-1.1.14 - cosFileTransfer-1.1.16 - cosNotification-1.1.21 - cosProperty-1.1.17 - cosTime-1.1.14 - cosTransactions-1.2.14 - et-1.5 - gs-1.5.16 - ic-4.3.6 - orber-3.7.1 - os_mon-2.3 - ose-1.0.2 - public_key-0.22.1 - reltool-0.6.6 - sasl-2.4.1 - typer-0.9.8 - webtool-0.8.10 - xmerl-1.3.7 Conflicts: OTP_VERSION erts/vsn.mk
Diffstat (limited to 'lib/hipe/vsn.mk')
-rw-r--r--lib/hipe/vsn.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/hipe/vsn.mk b/lib/hipe/vsn.mk
index cf1976d8d6..4cf09830cb 100644
--- a/lib/hipe/vsn.mk
+++ b/lib/hipe/vsn.mk
@@ -1 +1 @@
-HIPE_VSN = 3.11.1
+HIPE_VSN = 3.11.2