platform_external_cn-cbor/src, branch master Unnamed repository; edit this file 'description' to name the repository. resolve merge conflicts of 47983a039473f3848647c93278e2d4ae9a5eff51 to qt-dev-plus-aosp 2019-05-03T23:39:16+00:00 Haibo Huang hhb@google.com 2019-05-03T23:35:26+00:00 6c8c7e7e4ac8e4d373bfba19b1ebb4d357d2ab6d Exempt-From-Owner-Approval: Solve merge conflict Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: Idc64b93a422757ad92113b2902908d96730c772e 
Exempt-From-Owner-Approval: Solve merge conflict
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Idc64b93a422757ad92113b2902908d96730c772e
Fixing the pointer cast for ntoh32p in cn-cbor 2019-03-27T09:15:24+00:00 Max Bires jbires@google.com 2019-03-27T09:15:24+00:00 68f26babcee9c1fa6fc6edaa6ccd8acbe781caab This line was incorrectly casting p to a long pointer rather than a 32 bit integer pointer. Bug: 113512324 Test: it's unused code. Change-Id: Ib296a2b20c7c13bd94b9c7f8b666c4d1213bbfcf 
This line was incorrectly casting p to a long pointer rather than a 32
bit integer pointer.

Bug: 113512324
Test: it's unused code.
Change-Id: Ib296a2b20c7c13bd94b9c7f8b666c4d1213bbfcf
fixup! fixup! implement alignment-safe ntoh16p() && ntoh32p() 2018-03-23T21:14:36+00:00 Kaspar Schleiser kaspar@schleiser.de 2018-03-23T21:14:36+00:00 d458c34ab356b860ca8700023c76a402694dd3d0 






fixup! implement alignment-safe ntoh16p() && ntoh32p()
2018-03-23T21:10:41+00:00

Kaspar Schleiser
kaspar@schleiser.de

2018-03-23T21:10:41+00:00

6afc222e0b4373b04fde5b94742a224a72c57cca












fixup! cmake: add align_reads -> -DCBOR_ALIGN_READS
2018-03-23T21:10:27+00:00

Kaspar Schleiser
kaspar@schleiser.de

2018-03-23T21:10:27+00:00

6cd105dc93122d343e197bfac1d266ecab101a4f












cmake: add align_reads -> -DCBOR_ALIGN_READS
2018-03-23T21:08:26+00:00

Kaspar Schleiser
kaspar@schleiser.de

2018-03-23T21:08:26+00:00

94e6919a5eba61706f1808c78304b9cdfc06b88f












implement alignment-safe ntoh16p() && ntoh32p()
2018-03-17T11:41:25+00:00

Kaspar Schleiser
kaspar@schleiser.de

2018-03-16T14:33:00+00:00

894e0b468dffc0c2f8f9380337304e5fd8cf1ea4












cn-create: add cn_cbor_float_create
2018-02-26T15:28:27+00:00

Vincent Dupont
vincent@otakeys.com

2018-02-26T15:28:27+00:00

0301ef69c312cc663a6d3014c8831cfb2cc790ff












cn-create: add cn_cbor_double_create
2018-02-26T15:26:23+00:00

Vincent Dupont
vincent@otakeys.com

2018-02-22T11:37:20+00:00

2703d2d101deae1815d26fb26fb676902d27a58e












fix compilation error with gcc 7.2.0
2017-10-11T08:52:49+00:00

Sören Tempel
soeren+git@soeren-tempel.net

2017-10-11T08:52:49+00:00

2e513d9d7a02e4ae74afa638d02d2b724b4fee92