commit | ba03e0ef8693fd1d70d2de18c84c7b0ec41716f3 | [log] [tgz] |
---|---|---|
author | Alexander Thomas <athom@google.com> | Mon Sep 16 15:08:41 2019 +0200 |
committer | Alexander Thomas <athom@google.com> | Mon Sep 16 15:08:41 2019 +0200 |
tree | caa0b27001a80d941acdf71a80cbb47031033719 | |
parent | a0f2d5544389bfcec7cb1703e517a2c013fd4621 [diff] | |
parent | cbdbb464ca0301060f95c861d5fe0069d0d372f7 [diff] |
Version 2.6.0-dev.1.0 Merge commit 'cbdbb464ca0301060f95c861d5fe0069d0d372f7' into dev
diff --git a/tools/VERSION b/tools/VERSION index 618fa3d..da78ef9 100644 --- a/tools/VERSION +++ b/tools/VERSION
@@ -29,11 +29,11 @@ # * Deprecating an old ABI version: # - increase OLDEST_SUPPORTED_ABI_VERSION to the version that is supported. # -CHANNEL be +CHANNEL dev MAJOR 2 MINOR 6 PATCH 0 -PRERELEASE 0 +PRERELEASE 1 PRERELEASE_PATCH 0 ABI_VERSION 14 OLDEST_SUPPORTED_ABI_VERSION 13