Merge branch 'refactor'
authorGunnar Sletta <gunnar.sletta@nokia.com>
Tue, 13 Sep 2011 07:33:49 +0000 (09:33 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Tue, 13 Sep 2011 07:34:07 +0000 (09:34 +0200)
commite15d4c73762ca8b21acebe581c520bcd06a8d867
treeecf4903db11f3e8a58dadada2ceb38c869f761e3
parent7137785c87497f8beb5bda20505466430c6b1521
parent024b56232908af2083720c96a40666c325336141
Merge branch 'refactor'

Conflicts:
src/xmlpatterns/xmlpatterns.pro

Change-Id: I8d435220281ec372f23c98ab3c15c9a208bacad8
examples/xmlpatterns/filetree/filetree.pro
examples/xmlpatterns/recipes/recipes.pro
examples/xmlpatterns/schema/schema.pro
examples/xmlpatterns/trafficinfo/trafficinfo.pro
src/xmlpatterns/xmlpatterns.pro