diff options
author | Jason Barron <jbarron@trolltech.com> | 2009-04-30 13:24:55 (GMT) |
---|---|---|
committer | Jason Barron <jbarron@trolltech.com> | 2009-04-30 13:24:55 (GMT) |
commit | 32493498dcf3aa1ab9973aab381c5ca99d9ba9fd (patch) | |
tree | cb46e87a358289adbc5c58d74521676add50435e /.gitignore | |
parent | b20ca123c521a1dae695045211c253c221ed604a (diff) | |
parent | 4b1137345a0bbfedc348b020ad0ad6e5720eb6d1 (diff) | |
download | Qt-32493498dcf3aa1ab9973aab381c5ca99d9ba9fd.zip Qt-32493498dcf3aa1ab9973aab381c5ca99d9ba9fd.tar.gz Qt-32493498dcf3aa1ab9973aab381c5ca99d9ba9fd.tar.bz2 |
Merge commit 'private/translucentWindows'
Conflicts:
src/gui/styles/qs60style_symbian.cpp
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions