From c7f75bd9dcf328027096d829603a242306709cad Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 18 Dec 2019 00:03:52 +0100
Subject: [PATCH 1/2] Set version to 0.6.1.

---
 CMakeLists.txt |  2 +-
 Changelog.md   | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30073fd08..fb8c1a49c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.6.0")
+set(PROJECT_VERSION "0.6.1")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
 
 include(TestBigEndian)
diff --git a/Changelog.md b/Changelog.md
index e8731b5fa..9b4d81ff7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,15 @@
+### 0.6.1 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
+
 ### 0.6.0 (2019-12-17)
 
 Breaking changes:

From 4b026fa63355a19b64e43c0c15d6c6e8a9ed230a Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 18 Dec 2019 01:10:07 +0100
Subject: [PATCH 2/2] Update gas costs.

---
 test/libsolidity/GasCosts.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/libsolidity/GasCosts.cpp b/test/libsolidity/GasCosts.cpp
index 6b6adf2e3..de90c9076 100644
--- a/test/libsolidity/GasCosts.cpp
+++ b/test/libsolidity/GasCosts.cpp
@@ -99,7 +99,7 @@ BOOST_AUTO_TEST_CASE(string_storage)
 	auto evmVersion = dev::test::Options::get().evmVersion();
 
 	if (evmVersion <= EVMVersion::byzantium())
-		CHECK_DEPLOY_GAS(134145, 130831, evmVersion);
+		CHECK_DEPLOY_GAS(134209, 130895, evmVersion);
 	// This is only correct on >=Constantinople.
 	else if (Options::get().useABIEncoderV2)
 	{
@@ -107,22 +107,22 @@ BOOST_AUTO_TEST_CASE(string_storage)
 		{
 			// Costs with 0 are cases which cannot be triggered in tests.
 			if (evmVersion < EVMVersion::istanbul())
-				CHECK_DEPLOY_GAS(0, 123969, evmVersion);
+				CHECK_DEPLOY_GAS(0, 124033, evmVersion);
 			else
-				CHECK_DEPLOY_GAS(0, 110969, evmVersion);
+				CHECK_DEPLOY_GAS(0, 110981, evmVersion);
 		}
 		else
 		{
 			if (evmVersion < EVMVersion::istanbul())
-				CHECK_DEPLOY_GAS(147771, 131687, evmVersion);
+				CHECK_DEPLOY_GAS(147835, 131687, evmVersion);
 			else
-				CHECK_DEPLOY_GAS(131859, 117231, evmVersion);
+				CHECK_DEPLOY_GAS(131871, 117231, evmVersion);
 		}
 	}
 	else if (evmVersion < EVMVersion::istanbul())
-		CHECK_DEPLOY_GAS(126929, 119659, evmVersion);
+		CHECK_DEPLOY_GAS(126993, 119723, evmVersion);
 	else
-		CHECK_DEPLOY_GAS(114345, 107335, evmVersion);
+		CHECK_DEPLOY_GAS(114357, 107347, evmVersion);
 
 	if (evmVersion >= EVMVersion::byzantium())
 	{