merge tim's changes to local
authorfturovic <frank.turovich@nokia.com>
Tue, 12 May 2009 10:46:48 -0500
changeset 146 8eed74449d21
parent 145 385c4eb053ad (diff)
parent 143 1997ee87d0d4 (current diff)
child 147 2bb08686aa38
merge tim's changes to local
Binary file core/com.nokia.carbide.cpp/splash.bmp has changed