From e3b0a6a24b7ef6f0dc60c7d5e721b6ac9c15d079 Mon Sep 17 00:00:00 2001 From: Peter Wagenet Date: Tue, 10 May 2011 00:46:21 -0700 Subject: [PATCH] Version bump --- CHANGELOG.md | 7 +++++++ frameworks/runtime/core.js | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa5e1dafd4..4bb21db1b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ CHANGE LOG FOR 1.6 ================== +1.6.0.beta.2 +------------ +* Allow native touch scrolling inside an SC.TemplatePane. +* Add SC.Button template control. +* Created SC.TextField and SC.Checkbox views to eventually replace the *Support mixins. + + 1.6.0.beta.1 ------------ * Bugfixes to synchronization between SproutCore RecordArray/ManyArray/ChildArray and TemplateCollectionView diff --git a/frameworks/runtime/core.js b/frameworks/runtime/core.js index e78a5f1a25..aebe33ea90 100644 --- a/frameworks/runtime/core.js +++ b/frameworks/runtime/core.js @@ -36,7 +36,7 @@ if (typeof console === 'undefined') { // rest of the methods go into the mixin defined below. /** - @version 1.6.0.beta.1 + @version 1.6.0.beta.2 @namespace All SproutCore methods and functions are defined @@ -57,7 +57,7 @@ if (typeof console === 'undefined') { window.SC = window.SC || {} ; window.SproutCore = window.SproutCore || SC ; -SC.VERSION = '1.6.0.beta.1'; +SC.VERSION = '1.6.0.beta.2'; /** @private