diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-19 04:06:02 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-19 04:06:02 (GMT) |
| commit | f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682 (patch) | |
| tree | 65f3b637a19ff47fcc97e3f22deeae7d843cad17 /templates | |
| parent | 331ad8eb0aedb4baefcaf6f08a8e0ce440a32b06 (diff) | |
| parent | 8a7de547942c9a660dfc45c176ea1a3027bbf99a (diff) | |
| download | Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.zip Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.tar.gz Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.tar.bz2 | |
Merge remote branch 'origin/4.7' into oslo-staging-1
Conflicts:
mkspecs/common/symbian/symbian.conf
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/.gitattributes | 1 | ||||
| -rw-r--r-- | templates/.gitignore | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/templates/.gitattributes b/templates/.gitattributes new file mode 100644 index 0000000..6540c78 --- /dev/null +++ b/templates/.gitattributes @@ -0,0 +1 @@ +pkg_template.pkg -crlf diff --git a/templates/.gitignore b/templates/.gitignore new file mode 100644 index 0000000..1bb0965 --- /dev/null +++ b/templates/.gitignore @@ -0,0 +1 @@ +!*.pkg |