7c5a2c44ab
Merge commit '35fc2fe1464a8c221ebcdf2b4f322e561dca2d5a' into nanostack_release_13_0
...
* commit '35fc2fe1464a8c221ebcdf2b4f322e561dca2d5a':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 25b9124cd2..0903b819c5
2021-04-15 12:34:18 +03:00
3bb13c2405
Merge commit '856da9bd60f3409f55b21d8951bb3cc010668396' into feature-wisun
...
* commit '856da9bd60f3409f55b21d8951bb3cc010668396':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 91f3ff6d7f..25b9124cd2
2021-02-23 12:25:25 +02:00
e1fbfb682b
Merge commit 'ab953a0d782c8121aaf9b6c952410fa695841781' into PR14164
...
* commit 'ab953a0d782c8121aaf9b6c952410fa695841781':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 3183d87e41..f8ae0e9bc9
2021-01-21 14:11:58 +02:00
07089272fa
Merge commit '02021856e4681bd5092e48b8513ff90fb5d6b1e9' into origin/nanostack_release_12_8_0_feature_wisun
...
* commit '02021856e4681bd5092e48b8513ff90fb5d6b1e9':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 35b95da122..3183d87e41
2021-01-18 15:24:13 +02:00
423d4d8f87
Merge commit 'dad29520878740d4673638d73cfb53d757b7895c' into feature-wisun
...
* commit 'dad29520878740d4673638d73cfb53d757b7895c':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 715ae9a693..35b95da122
2020-12-14 10:31:07 +02:00
283197975c
Merge commit '02935482aeb5abe15817c48ad6ca078e79c00478' into feature-wisun
...
* commit '02935482aeb5abe15817c48ad6ca078e79c00478':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 09d9e24f2d..d207f4d9f9
2020-10-28 15:35:54 +02:00
99bd22cfaf
Merge commit '769796ee45960a01489665d1af0325e6680b2211' into feature-wisun
...
* commit '769796ee45960a01489665d1af0325e6680b2211':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from b969fa3779..9a1b35398c
2020-09-10 13:26:48 +03:00
a21c2e20fe
Merge commit '9bea7f4b891f33623aca0e51b92736818397de1b' into nanostack_milestone5_prerel
...
* commit '9bea7f4b891f33623aca0e51b92736818397de1b':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 48609aeded..91acececbd
2020-09-02 10:49:11 +03:00
75e1781f0c
Merge commit '96d7abd79fc58007ec6ed11dc73e64145b30d528' into feature-wisun
...
* commit '96d7abd79fc58007ec6ed11dc73e64145b30d528':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from b3fe5744d1..48609aeded
2020-08-17 17:18:15 +03:00
5f4ae1f766
Merge commit '528aa2f96fd4702b02ae9fff3dacd546ee984fde' into feature-wisun
...
* commit '528aa2f96fd4702b02ae9fff3dacd546ee984fde':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 9a2166869f..b3fe5744d1
2020-06-08 10:12:05 +03:00
314eb7a586
Merge commit '1687b4aa4f8e24dffa1b019757c081da48bf526d' into feature-wisun
...
* commit '1687b4aa4f8e24dffa1b019757c081da48bf526d':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from cc03296c27..9a2166869f
2020-05-11 11:42:39 +03:00
1317bf6df7
Merge commit '8696907765975bba8cb098c2772c89198c71a783' into feature-wisun
...
* commit '8696907765975bba8cb098c2772c89198c71a783':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from fb7413b846..cc03296c27
2020-04-16 14:23:56 +03:00
a237e58aa1
Merge commit '02e9af5a29789203f54f3c0d5dc91512f3a85e92' into feature-wisun
...
* commit '02e9af5a29789203f54f3c0d5dc91512f3a85e92':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 9b3e144f5b..fb7413b846
2020-02-26 13:23:21 +02:00
79f8355334
Fixed compilation warnings
2019-11-19 15:15:12 +02:00
12d4497ab7
Merge commit '0b6ccc5816e44df9fe89c476514cb7043dfb483b'
...
* commit '0b6ccc5816e44df9fe89c476514cb7043dfb483b':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 0824752..9b3e144
2019-11-18 15:08:32 +02:00
c15478021b
Merge commit '3e6cb31659a56d343c7b8fe37645f195eb87ffcf'
...
* commit '3e6cb31659a56d343c7b8fe37645f195eb87ffcf':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from c473148..0824752
2019-10-07 13:00:49 +03:00
00bf399628
Merge commit 'b7910939daa15a8e658dbc58bccaeb3bb101d338'
...
* commit 'b7910939daa15a8e658dbc58bccaeb3bb101d338':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 3c7d50e..4a19dc4
2019-08-26 15:13:00 +03:00
d902c1a135
Merge commit 'c51a57a0334645b14794f6082737b11d8b8c56db' into prepare_for_mbedos_5_13_3
...
* commit 'c51a57a0334645b14794f6082737b11d8b8c56db':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 0345477..3c7d50e
2019-08-02 13:52:37 +03:00
07aac7b911
Merge commit '1c29564f653e93a2bda270b257c9bb239de9b61e' into prepare_for_mbedos513
...
* commit '1c29564f653e93a2bda270b257c9bb239de9b61e':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 84a07ce..0345477
2019-05-21 14:22:20 +03:00
b68e5edbc7
Merge commit '780e9afb8f3b8f09e66573e7d4ba096dd9a87dd7'
...
Nanostack v10.1.0 for Mbed OS 5.12
* commit '780e9afb8f3b8f09e66573e7d4ba096dd9a87dd7':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 513a38e..c5ee9e4
2019-02-25 14:24:47 +02:00
d879422f5e
Merge commit '77818568c6d9389ef1eb82e40ebfbbf26626c9d3' into mbedos511
...
* commit '77818568c6d9389ef1eb82e40ebfbbf26626c9d3':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from ccd30a3..513a38e
2018-11-10 20:16:03 +02:00
ef39a19ba9
Merge commit '6dd01c679db4deb0a4a2c55832f3abe7b19bc51b' into mbedos511
...
* commit '6dd01c679db4deb0a4a2c55832f3abe7b19bc51b':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 2535a6c..ccd30a3
2018-11-05 17:08:28 +02:00
8c94411882
Merge commit '94f82102284f73721f685ec9ae535aef815e0d69'
...
* commit '94f82102284f73721f685ec9ae535aef815e0d69':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 7963594..2535a6c
2018-08-22 10:52:10 +03:00
edfeecdab8
Merge commit '7e1fb3c8420b4d7e43c740c3e779751c9eedb4fb'
...
* commit '7e1fb3c8420b4d7e43c740c3e779751c9eedb4fb':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 82bbdcc..4a188ea
2018-08-08 16:51:52 +03:00
2f0bd6b6f6
Merge commit '8e546a301f0b93dab28e7b4454df97e5f9e83843'
...
* commit '8e546a301f0b93dab28e7b4454df97e5f9e83843':
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 43c7ec2..82bbdcc
2018-05-11 09:52:10 +03:00
f0bf771502
Get rid of FEATURE_NANOSTACK
...
Allow FEATURE_NANOSTACK still to be defined in the build so
that we don't break any builds.
2018-04-27 14:38:44 +03:00
Arto Kinnunen
Jarkko Paso
Deepak Venugopal
Juhani Puurula
Seppo Takalo