diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-15 10:34:32 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-15 10:35:01 +0300 |
| commit | 5fdfbec8369f990bd4b9def1294ade6bbf60e143 (patch) | |
| tree | 890bd6a48788264d34994beaadbc0881c162f21c /.gitattributes | |
| parent | 63dec9bbd826a4afafa7177aaa3439467f25d80a (diff) | |
| parent | 0d0eca50521fcde987be3b97ffd29442db7435ff (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
* origin/5.12:
qt5: update to Qt 5.12.5
Add CI build instructions
qt5-creator: fix build with musl
ogl-runtime: fix build on musl libc
Change-Id: Ia5d0e73a06489bebf70897805bb0aa314ba5a663
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index cb2381c0..f6a86105 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ +/coin export-ignore # linguist overrides recipes-*/**/*.inc linguist-language=BitBake |