merging, not sure why I get a conflict on this, must be doing something wrong in my work flow

This commit is contained in:
thatcher 2013-03-06 05:55:53 -05:00
commit 9503fac39d

View File

@ -184,6 +184,7 @@ $.Tile.prototype = {
}
rendered = TILE_CACHE[ this.url ];
//rendered.save();
context.drawImage(
rendered.canvas,