# HG changeset patch
# User Brendan Donegan <brendand@symbian.org>
# Date 1278322894 -3600
# Node ID 90101aa1a17782d427cc3dab026f39eeed90cb42
# Parent  c2940da46e9aa78f160530b0720e3f794964c340# Parent  4af748f40e05164fe00b339748677f0bf8a1ccba
Merge

diff -r c2940da46e9a -r 90101aa1a177 common/templates/run-qmake.ant.xml.ftl