diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-24 17:28:43 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-24 17:28:43 +0200 |
| commit | d8a590676b6c7d72406bd2f9b8185f38282fdfa7 (patch) | |
| tree | c081ff601ae4a56ecda95f52ca17e4bcfe402a1f /.gitignore | |
| parent | 0c6147d9b5ffbe18bfe1e8deb9cc128c9a0fad27 (diff) | |
| parent | e643f766fa23ee73f7095d7ba20a385cef0f25a0 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ice3d6e88238940a62d75e7c67f63b626285fccb0
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 67a9d4d04..9f362ff0f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ src/core/api/Release src/core/api/Debug src/core/core_generated.gyp src/core/gypfiles -src/core/qmake_extras.gypi examples/webengine/quicknanobrowser/quicknanobrowser examples/webengine/quicknanobrowser/quicknanobrowser.app examples/webenginewidgets/browser/browser |