# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1245179150 18000
# Node ID a78ee2a087c7cf111d5c57b1352f08d5c5517ec2
# Parent  7987aa945837fec7d915a51752282f731e8f71e2# Parent  a2c610d72af3cd574e71853a0684eed80329bf4a
merge

diff -r 7987aa945837 -r a78ee2a087c7 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/RCOMPErrorParser.java
diff -r 7987aa945837 -r a78ee2a087c7 debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java