diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-05-25 10:09:46 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-05-25 10:09:46 (GMT) |
| commit | 2447c023bc0113bace6f31d93ea942f7b8cb17da (patch) | |
| tree | 1f8775a3d11d64bda60a52fabcbb900981e1356c /.gitignore | |
| parent | c6d92ebe915e4ed857aca5130e514c6ec81dd33f (diff) | |
| parent | d9e41640dcbd7a5f5f9d7afb1024e1c4f6672f6e (diff) | |
| download | Qt-2447c023bc0113bace6f31d93ea942f7b8cb17da.zip Qt-2447c023bc0113bace6f31d93ea942f7b8cb17da.tar.gz Qt-2447c023bc0113bace6f31d93ea942f7b8cb17da.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -131,6 +131,8 @@ qrc_*.cpp *.vcproj *vcproj.*.*.user *.ncb +*.vcxproj +*.vcxproj.filters # MinGW generated files *.Debug |