# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1242143208 18000
# Node ID 8eed74449d218b270f9eb64b81f26941a98e8d41
# Parent  385c4eb053ad10b2177b6bce4c791b8505cb08ff# Parent  1997ee87d0d4b0e8568f1bd99f49d540ab3deb46
merge tim's changes to local

diff -r 1997ee87d0d4 -r 8eed74449d21 core/com.nokia.carbide.cpp/splash.bmp
Binary file core/com.nokia.carbide.cpp/splash.bmp has changed