Merge branch 'security-CKM' into 'master'
[platform/upstream/iotivity.git] / resource / csdk / connectivity / inc / cablockwisetransfer.h
2015-09-28 Sachin AgrawalMerge branch 'security-CKM' into 'master'
2015-09-25 K.J. KaoMerge branch 'remote-access2'
2015-09-20 Sachin AgrawalMerge branch 'security-summit' into 'master'
2015-09-19 Dmitrii ZhuravlevMerge branch 'security-CKM' into 'master'
2015-09-18 Madan LankaMerge "Merge branch 'master' into simulator" into simulator
2015-09-18 Harish Kumara MarappaMerge branch 'master' into simulator
2015-09-18 Madan LankaMerge "Merge branch 'master' into resource-encapsulatio...
2015-09-18 hunje.yeonMerge branch 'master' into resource-encapsulation
2015-09-17 hyuna0213.joModified the argument in CAAddBlockOption()
2015-09-10 Mandeep ShettyMerge branch 'master' into ra.to.merge
2015-09-01 G S Senthil KumarMerge branch 'master' into simulator
2015-08-31 Sachin AgrawalMerge branch 'master' into 'security-CKM' branch
2015-08-27 Vinil JainMerge branch 'master' into easysetup & CBOR changes
2015-08-09 Sachin AgrawalMerge branch 'master' into 'security-basecamp'
2015-08-05 Sachin AgrawalMerge branch 'master' into 'security-basecamp'
2015-08-05 jihwanseomodified CA comment for doxygen.
2015-08-03 Sachin AgrawalMerge branch 'master' into 'security-CKM' branch.
2015-08-03 Harish Kumara MarappaMerge branch 'master' into simulator
2015-07-30 jihwanseoupdated the logic to combining block1 and block2 option
2015-07-22 hyuna0213.joblockwise-transfer rebase into master for merge/review