# HG changeset patch
# User stechong
# Date 1246910359 18000
# Node ID 539b1b65d45f85faed31b0ab0139eb941c20c704
# Parent  55ef76a19104520c0e459cb750cde58fdfc5c188# Parent  d0fdcfed28a6ad3e4ae482d23daad68d439d459d
merge commit

diff -r d0fdcfed28a6 -r 539b1b65d45f core/com.nokia.carbide.cpp.codescanner/Tools/codescanner.exe
Binary file core/com.nokia.carbide.cpp.codescanner/Tools/codescanner.exe has changed