aboutsummaryrefslogtreecommitdiffstats
path: root/OTP_VERSION
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-08-08 15:02:29 +0200
committerMarcus Arendt <[email protected]>2014-08-08 15:02:29 +0200
commite189bae81fbc873d3349b9dec12ef234daf9d8ad (patch)
tree52d2791377955057c44fad4d0479439c900b9c77 /OTP_VERSION
parent2525622c384b27581c4b4cb158fc951f15ac5ca3 (diff)
parentc472c3f5aafc81a409d0443c4601de43bafb53cb (diff)
downloadotp-e189bae81fbc873d3349b9dec12ef234daf9d8ad.tar.gz
otp-e189bae81fbc873d3349b9dec12ef234daf9d8ad.tar.bz2
otp-e189bae81fbc873d3349b9dec12ef234daf9d8ad.zip
Merge branch 'maint-17' into maint
Diffstat (limited to 'OTP_VERSION')
-rw-r--r--OTP_VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/OTP_VERSION b/OTP_VERSION
index 59a75133a2..8fad390b2f 100644
--- a/OTP_VERSION
+++ b/OTP_VERSION
@@ -1 +1 @@
-17.1.2
+17.2