# HG changeset patch
# User Zorg <zorgiepoo@gmail.com>
# Date 1302033941 14400
# Node ID 79faa11300110591d821eb996a4dcc9ed6483109
# Parent  e8944ed92b61f380394f2327a97ef4722ded49cb# Parent  e31409482740fba9a4d5df2001872f1fb7e3d1d9
Testing a merge.

diff -r e31409482740 -r 79faa1130011 QTfrontend/M3Panel.mm
diff -r e31409482740 -r 79faa1130011 QTfrontend/SDLs.cpp