diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-19 09:48:01 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-19 09:49:17 +0200 |
| commit | 895fde86653c20acf2a905008f1b4ff839190608 (patch) | |
| tree | 0ab7fa1345e449e90f27257f2b1238ffb161630a | |
| parent | f161fe88e557fca137b8b7010122785b42ccbdb8 (diff) | |
| parent | 021061a9f38fbba5a8a65e425f2232587a1676bd (diff) | |
| download | meta-boot2qt-895fde86653c20acf2a905008f1b4ff839190608.tar.gz | |
Merge remote-tracking branch 'origin/pyro' into sumo
* origin/pyro:
021061a Revert "qtdeclarative: fix inconsistent QML_COMPILE_HASH value"
7222b6f poky: update to latest revision (pyro)
9e428d2 qtdeclarative: fix inconsistent QML_COMPILE_HASH value
3af90cf Add .gitignore and .tag files
Conflicts:
scripts/manifest.xml
Change-Id: Iac6334a3be51470cce119b26d9b04a6809a23463
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .tag | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6ffab9a --- /dev/null +++ b/.gitignore | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | *.orig | ||
| 2 | *.rej | ||
| @@ -0,0 +1 @@ | |||
| $Format:%H$ | |||