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

diff -r 95d30b851e36 -r c0d6044491e0 common/templates/run-qmake.ant.xml.ftl