diff options
| author | Kieran Cawthray <kieranc@gmail.com> | 2021-08-12 21:26:51 +0200 |
|---|---|---|
| committer | Kieran Cawthray <kieranc@gmail.com> | 2021-08-12 21:26:51 +0200 |
| commit | 52ee25e551f506cdaadfb6a62feda1d2aaa8497b (patch) | |
| tree | 6c5abc74c56400d222c105b9826fd5e58d3ce522 /.gitignore | |
| parent | 12aeb4688923a06d574b7aa7262626e7eab5b7f1 (diff) | |
| parent | 643077341b14a52819cbaf02abbd5fb56cdeb802 (diff) | |
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4,7 +4,7 @@ # CMake cmake-build-* -cmake-* +cmake-*/ CMakeFiles **/CMakeCache.txt cmake_install.cmake |