merged conflict

This commit is contained in:
thatcher 2013-03-14 09:08:27 -04:00
commit 0297a20aee

View File

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