Merge commit '5aac3bf'
commitd99f65295ca57c942f82b0dcf609c4cbe993e179
authorMauro Iazzi <mauro.iazzi@gmail.com>
Fri, 5 Feb 2010 00:22:32 +0000 (5 01:22 +0100)
committerMauro Iazzi <mauro.iazzi@gmail.com>
Fri, 5 Feb 2010 00:22:32 +0000 (5 01:22 +0100)
tree3890916a8e25758735539cef775840a7ac2fe6bd
parente381633acf5abd139f38ac74b09db19d29845f51
parent5aac3bf7c25ec890031f243a3707e4699dc9b0d6
Merge commit '5aac3bf'

Fix Qt 4.6 in linux?

Conflicts:
CMakeLists.txt
generator/qt_internal.lua
generator/qt_internal.lua