diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 14:09:38 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 14:09:38 +0200 |
| commit | ff8d46acfc8c3bea02ef0379b5ca396d2e5f8c36 (patch) | |
| tree | 2d04aa9b4b7921ea973b683803aba7309eab81ab | |
| parent | c9c8583159ec81460e4b53bc12998a50ece44409 (diff) | |
| parent | 9a714258f32a6a5318eb461903af25f64b7c80d2 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/imports/qtcanvas3d/canvas3d.cpp
Change-Id: Iefff63ec23e8ea43deaa76c20b50d196bce628ba
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 0909f7a..018cf2c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ .tag export-subst +.gitignore export-ignore .gitattributes export-ignore |