diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-10 15:02:09 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-10 13:07:14 +0000 |
| commit | 6c6644c19f61d79ef9e11bac48e8efc9a0d624dc (patch) | |
| tree | 01384ce1033440a6b86f75a0996bc6a2551513f5 /.lfsconfig | |
| parent | d0b251c507534cfcc672f298fbd1af7fa13673eb (diff) | |
| parent | 4d4b15f48b82345619901cead73a7ce78a2b08f8 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
* origin/5.14:
4d4b15f Doc: Bump version to 5.14.1
fa9ddd0 Remove emulator specific code blocks from demos
534cd52 Remove lfs config
be1e3a7 Move WebEngine initialization to be earlier
Conflicts:
doc/b2qt-demos.qdoc
doc/b2qt-demos.qdocconf
Change-Id: I2844c04a3b247117b653d1f23572b9d6add34931
Diffstat (limited to '.lfsconfig')
| -rw-r--r-- | .lfsconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.lfsconfig b/.lfsconfig deleted file mode 100644 index ce7dadc..0000000 --- a/.lfsconfig +++ /dev/null @@ -1,2 +0,0 @@ -[lfs] -url = https://git-lfs.qt.io/Gerrit/boot2qt-demos.git/info/lfs |