# HG changeset patch
# User Grumpy7
# Date 1370294713 -7200
# Node ID 0e8cff85fb00af932182ed614b9612d96c1a2a84
# Parent  fc2721c89fdb9e58235cb65929e9f1c5316df13f# Parent  8ce08eea96edd7244bbfe04830abfbcf42d39358
Merge

diff -r 8ce08eea96ed -r 0e8cff85fb00 Render.cpp