diff options
author | Janne Anttila <janne.anttila@digia.com> | 2009-05-04 11:45:22 (GMT) |
---|---|---|
committer | Janne Anttila <janne.anttila@digia.com> | 2009-05-04 11:45:22 (GMT) |
commit | 812b8de816bf84a5607d5a5d178283be3eb6bfc7 (patch) | |
tree | 825cd53c867bf0ea6792a5a4da5998ca2ae710a3 | |
parent | 1a0fd473bcea62d1e471bb49ca06d931d0deb616 (diff) | |
parent | 943519ba6684a700998cba94226389f2c509d065 (diff) | |
download | Qt-812b8de816bf84a5607d5a5d178283be3eb6bfc7.zip Qt-812b8de816bf84a5607d5a5d178283be3eb6bfc7.tar.gz Qt-812b8de816bf84a5607d5a5d178283be3eb6bfc7.tar.bz2 |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -185,6 +185,7 @@ bld.inf !s60main.rss *.pkg plugin_commonU.def +*.qtplugin *.sis *.sisx |