diff options
| author | Joaquim <joaquim.org@gmail.com> | 2021-02-01 10:44:10 (GMT) |
|---|---|---|
| committer | Joaquim <joaquim.org@gmail.com> | 2021-02-01 10:44:10 (GMT) |
| commit | ccd423bcef52b241fa0ced82d59fdb432b4347de (patch) | |
| tree | a57c56f146faf53153f5a188fdb33ea7430872ef /src | |
| parent | a456887eff1bc0de6c6a8ecb49a961ffe75661db (diff) | |
| parent | 9c35b6fe5dc889b589b979dd7c650c70f302854b (diff) | |
Merge branch 'develop' of https://github.com/JF002/Pinetime into LVGL7
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085122560.tpg | 4 | ||||
| -rw-r--r-- | src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085441153.pts | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fd8168c..c55c77a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -662,7 +662,7 @@ include_directories( "${NRF5_SDK_PATH}/modules/nrfx/drivers/include" "${NRF5_SDK_PATH}/modules/nrfx/hal" "${NRF5_SDK_PATH}/modules/nrfx/mdk" - ${NRF5_SDK_PATH}/external/freertos/source/include + "${NRF5_SDK_PATH}/external/freertos/source/include" "${NRF5_SDK_PATH}/components/toolchain/cmsis/include" "${NRF5_SDK_PATH}/components/libraries/atomic" "${NRF5_SDK_PATH}/components/libraries/atomic_fifo" diff --git a/src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085122560.tpg b/src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085122560.tpg index f5bb0ce..3cc985f 100644 --- a/src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085122560.tpg +++ b/src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085122560.tpg @@ -1,4 +1,4 @@ -<!-- START ENCRYPTED FILE --->
+<!-- START ENCRYPTED FILE ---> M'&/JP\$+#X83?)"[ M2E=\N*7*U 5)JSKT(5#=>@^/#]IP*[GTZ0%0]$F(/$ MEK[V7>349??;!JZJNFZ CK=QGD^FOYV^FU>"DK<@0U*##HV\H9&_%["5IK@1 MA9F,FJO2P^3:4_]04%-0T%9=^XCMWKF"L$[)%)G>_I 0Q?@:H)&1HX)7VY&. @@ -1023,4 +1023,4 @@ M<74&Z:0BS4[#$;M2_1""EZVO@$B^"0'V'W:7^@-<RY.=,$D<>]G?*\B>0M(- M6MF1FM+ ?,?3[N*1EI"$AXF#@6P-FU/4\QF?O!&%CE5*6J2'@QDYV?_04-O) M7Z 6N;C7E_4<F/8XVG7AJ7J1LH.IECZ6%G $HMQ2FZX'!S+=;-"'3%ZWD\!W L@U91N$5;H(.IY7/\[ +<DK:=41RCLZB8DY:;7E]*"<<2\\K1C(F(AZJX39 -<!-- END ENCRYPTED FILE --->
+<!-- END ENCRYPTED FILE ---> diff --git a/src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085441153.pts b/src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085441153.pts index 92507b1..6760d5e 100644 --- a/src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085441153.pts +++ b/src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085441153.pts @@ -286,4 +286,4 @@ <item><table>7</table><row>3</row></item> </profile> </pics> - </project>
+ </project> |