diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-04-09 21:16:21 +0200 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-04-09 21:16:21 +0200 |
| commit | 15b3b8e282dd5b2132b0095716cd9d88740d4579 (patch) | |
| tree | c26870103f8baaa933399cfb86cca25aa7e60d8b /.vscode | |
| parent | 9ac4be8b759bb2cedeb999ce5e87d983261beded (diff) | |
| parent | 57b4c3f0edc6acfa31bd2160abdcd6091920ba63 (diff) | |
Merge branch 'develop' into motion-sensor
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/Apps.h
# src/displayapp/DisplayApp.cpp
# src/displayapp/DisplayApp.h
# src/displayapp/lv_pinetime_theme.c
# src/displayapp/screens/ApplicationList.cpp
# src/drivers/TwiMaster.cpp
# src/systemtask/SystemTask.h
Diffstat (limited to '.vscode')
| -rw-r--r-- | .vscode/settings.json | 56 |
1 files changed, 55 insertions, 1 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json index 5e09a03c..05b11756 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,59 @@ { "files.associations": { - "chrono": "cpp" + "chrono": "cpp", + "list": "cpp", + "array": "cpp", + "atomic": "cpp", + "bit": "cpp", + "*.tcc": "cpp", + "cctype": "cpp", + "charconv": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "condition_variable": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "deque": "cpp", + "unordered_map": "cpp", + "vector": "cpp", + "exception": "cpp", + "algorithm": "cpp", + "functional": "cpp", + "iterator": "cpp", + "memory": "cpp", + "memory_resource": "cpp", + "netfwd": "cpp", + "numeric": "cpp", + "optional": "cpp", + "random": "cpp", + "ratio": "cpp", + "string": "cpp", + "string_view": "cpp", + "system_error": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "utility": "cpp", + "fstream": "cpp", + "initializer_list": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "limits": "cpp", + "mutex": "cpp", + "new": "cpp", + "ostream": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "streambuf": "cpp", + "thread": "cpp", + "cinttypes": "cpp", + "typeinfo": "cpp" } }
\ No newline at end of file |