# HG changeset patch
# User Eric Wing <ewing . public |-at-| gmail . com>
# Date 1296549502 28800
# Node ID 91c40787cc0cd2b7ff90de775cb905c0d4aac841
# Parent  79c940185692c4a3192d441b64e2affc711d9ecc
merged SDL

diff -r 79c940185692 -r 91c40787cc0c .hgsubstate
--- a/.hgsubstate	Tue Feb 01 00:31:08 2011 -0800
+++ b/.hgsubstate	Tue Feb 01 00:38:22 2011 -0800
@@ -1,4 +1,4 @@
-067973aec4d8da04aa6ed06d615a890418a4ef85 SDL
+2c500f37abcf05ad8de75bbd1cab5f5fea53ad7d SDL
 98f97f83e203853002e2459ca501fa62281e176b SDL_image
 78cff6a4649c139f5cd7e999ff372b7ee1c5755b SDL_ttf
 fdc8cc5496c5a77ebb4d0db5bf23d2695296a52e freetype