From 7b00aa808183166315d223e2c948eafab63c1fd7 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Wed, 11 Apr 2012 21:23:54 +0200
Subject: [PATCH] * Fixed merge oops

---
 lib/ace/virtual_renderer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js
index 26b2a34a..116a6ef2 100644
--- a/lib/ace/virtual_renderer.js
+++ b/lib/ace/virtual_renderer.js
@@ -728,7 +728,7 @@ var VirtualRenderer = function(container, theme) {
     this.STEPS = 10;
     this.$calcSteps = function(fromValue, toValue){
         var i = 0;
-        var l = STEPS;
+        var l = this.STEPS;
         var steps = [];
         
         var func  = function(t, x_min, dx) {
@@ -759,7 +759,7 @@ var VirtualRenderer = function(container, theme) {
             this.$timer = setInterval(function() {
                 _self.session.setScrollTop(steps[i]);
                 
-                if (++i == STEPS + 1)
+                if (++i == this.STEPS + 1)
                     clearInterval(_self.$timer);
             }, 10);
         }