# HG changeset patch # User Sam Lantinga # Date 1349991867 25200 # Node ID 028529a31bc4589711d773f4f28f23420bc19c21 # Parent 833a983f218ef2c13a2c5b7a0bec789fd90aeaf0# Parent b4e467b7761a46039be13363801937b1ba7248e5 Merged Ryan's changes