From cca654d10d1932596bc12be227ecddc812082088 Mon Sep 17 00:00:00 2001
From: emsquared <mikey@codeux.com>
Date: Wed, 8 Aug 2012 21:05:50 -0400
Subject: [PATCH] =?UTF-8?q?We=20no=20longer=20disable=20elastic=20bounce?=
 =?UTF-8?q?=20on=20our=20web=20view=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Classes/Views/Channel View/TVCLogController.m | 7 -------
 Resources/Info.plist                          | 4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Classes/Views/Channel View/TVCLogController.m b/Classes/Views/Channel View/TVCLogController.m
index 0d0c851a80..f71b0c7d22 100755
--- a/Classes/Views/Channel View/TVCLogController.m	
+++ b/Classes/Views/Channel View/TVCLogController.m	
@@ -1069,13 +1069,6 @@ - (void)setUpScroller
 	if ([scrollView respondsToSelector:@selector(setAllowsHorizontalScrolling:)]) {
 		[scrollView performSelector:@selector(setAllowsHorizontalScrolling:) withObject:NO];
 	}
-	
-#ifdef TXMacOSLionOrNewer
-	if ([TPCPreferences featureAvailableToOSXLion]) {
-		[scrollView setHorizontalScrollElasticity:NSScrollElasticityNone];
-		[scrollView setVerticalScrollElasticity:NSScrollElasticityNone];
-	}
-#endif
 }
 
 #pragma mark -
diff --git a/Resources/Info.plist b/Resources/Info.plist
index 49b18c46ce..1a88c0ff14 100755
--- a/Resources/Info.plist
+++ b/Resources/Info.plist
@@ -47,8 +47,8 @@
 	<key>TXBundleBuildCodeName</key>
 	<string>Turtle Soup</string>
 	<key>TXBundleBuildNumber</key>
-	<string>12324</string>
+	<string>12325</string>
 	<key>TXBundleBuildReference</key>
-	<string>2.1.1-288-g355fccd-debug</string>
+	<string>2.1.1-289-g8dfa27e-appstore</string>
 </dict>
 </plist>