diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:09:01 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:09:01 +0100 |
| commit | 8f012dd05873d33d0ce9dc7b076418cc3096106e (patch) | |
| tree | 0f3b9876cd403ddb9ad5e7dad8491576009580be /.gitignore | |
| parent | 6c7ecc08666b33596ebb997adf6eccaeda311d4c (diff) | |
| parent | b2f9aaa6b05769dd5b07dce86af3d3fc0938d42e (diff) | |
| download | qtxmlpatterns-8f012dd05873d33d0ce9dc7b076418cc3096106e.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: Id327fd1d5933b38c3fcc3f7e9edadb34aaf7a059
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -1,14 +1,6 @@ # This file is used to ignore files which are generated in the Qt build system # ---------------------------------------------------------------------------- -examples/*/*/* -!examples/*/*/*[.]* -!examples/*/*/README -examples/*/*/*[.]app -!examples/declarative/* -!examples/tutorials/* -!examples/tutorials/*/* -!examples/ja_JP/*/* demos/*/* !demos/spectrum/* demos/spectrum/bin |