aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li2019-09-041-1/+1
|\
| * DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li2019-07-011-1/+1
|/|
| * resolve merge conflicts of 47983a039473f3848647c93278e2d4ae9a5eff51 to qt-dev...Haibo Huang2019-05-039-7/+113
| |\ | |/ |/|
* | Upgrade cn-cbor to f1cf9ffdf5cfab935a45900556f9b68af925c256Haibo Huang2019-05-039-7/+113
|\ \
| * \ Upgrade cn-cbor to f1cf9ffdf5cfab935a45900556f9b68af925c256Haibo Huang2019-05-039-7/+113
| |\ \
| | * \ Merge pull request #47 from kaspar030/make_ntohxp_alignment_safecabo2018-04-053-1/+20
| | |\ \
| | | * | fixup! fixup! implement alignment-safe ntoh16p() && ntoh32p()Kaspar Schleiser2018-03-231-2/+2
| | | * | fixup! implement alignment-safe ntoh16p() && ntoh32p()Kaspar Schleiser2018-03-231-1/+6
| | | * | fixup! cmake: add align_reads -> -DCBOR_ALIGN_READSKaspar Schleiser2018-03-231-1/+1
| | | * | fixup! cmake: add align_reads -> -DCBOR_ALIGN_READSKaspar Schleiser2018-03-231-1/+1
| | | * | cmake: add align_reads -> -DCBOR_ALIGN_READSKaspar Schleiser2018-03-232-0/+4
| | | * | implement alignment-safe ntoh16p() && ntoh32p()Kaspar Schleiser2018-03-171-2/+12
| | |/ /
| | * | Merge pull request #46 from OTAkeys/add_floatcabo2018-02-264-0/+85
| | |\ \
| | | * | cn-create: add cn_cbor_float_createVincent Dupont2018-02-263-0/+34
| | | * | test: add create double testVincent Dupont2018-02-261-0/+21
| | | * | cn-create: add cn_cbor_double_createVincent Dupont2018-02-262-0/+30
| | |/ /
| | * | Merge pull request #45 from beduino-project/fix-function-declarationcabo2018-02-021-1/+1
| | |\ \
| | | * | test: Fix declaration of main methodSören Tempel2018-02-021-1/+1
| | |/ /
| | | * Merge master@5428150 into git_qt-dev-plus-aosp.android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseBill Rassieur2019-04-030-0/+0
| | | |\
| | | | * Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-021-1/+1
| | | | |\ | | | | |/ | | | |/|
| | | * | Fixing the pointer cast for ntoh32p in cn-cborMax Bires2019-03-271-1/+1
| | | |/
| | | * [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-240-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
|\ \ \ \
| | | | * Add default code reviewers into OWNERS am: 03dfd17ecc am: bb7c28409dChih-Hung Hsieh2019-01-141-0/+3
| | | | |\ | | |_|_|/ | |/| | |
| * | | | Add default code reviewers into OWNERS am: 03dfd17eccChih-Hung Hsieh2019-01-141-0/+3
| |\ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
* | | | Add default code reviewers into OWNERSChih-Hung Hsieh2019-01-141-0/+3
|\ \ \ \ | |/ / / |/| / / | |/ /
| * / Add default code reviewers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Chih-Hung Hsieh2019-01-081-0/+3
|/ /
* | Added blueprint, module license, and METADATA file am: dd6fcf75d7 am: 971af5a0a6android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r3android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-wear-8.0.0_r2android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r3android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r2android-9.0.0_r19android-9.0.0_r18android-9.0.0_r17android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-platform-releasepie-gsipie-dr1-releasepie-dr1-devpie-devpie-cuttlefish-testingpie-cts-releasepie-b4s4-releasepie-b4s4-devmaster-cuttlefish-testing-releaseJanis Danisevskis2018-01-183-0/+49
|\ \
| * \ Added blueprint, module license, and METADATA file am: dd6fcf75d7Janis Danisevskis2018-01-183-0/+49
| |\ \
| | * \ Added blueprint, module license, and METADATA fileJanis Danisevskis2018-01-183-0/+49
| | |\ \
| | | * | Added blueprint, module license, and METADATA fileandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1Janis Danisevskis2018-01-173-0/+49
* | | | | Merge upstream for the first time am: 3798baae63 am: 8a9d358531Janis Danisevskis2018-01-1829-0/+3624
|\| | | |
| * | | | Merge upstream for the first time am: 3798baae63Janis Danisevskis2018-01-1829-0/+3624
|/| | | | | |/ / /
| * / / Merge upstream for the first timeJanis Danisevskis2018-01-1829-0/+3624
|/| | | | |/ /
| * / Merge upstream for the first timeJanis Danisevskis2018-01-1729-0/+3624
|/| | | |/
| * Merge pull request #43 from nmeum/gcc-7.2.0cabo2017-10-121-0/+1
| |\
| | * fix compilation error with gcc 7.2.0Sören Tempel2017-10-111-0/+1
| |/
| * Merge pull request #42 from hildjj/cmake-backportscabo2015-11-171-4/+7
| |\
| | * Make Travis cmake builds less interesting, hopefully faster as wellJoe Hildebrand2015-11-171-4/+7
| |/
| * Merge pull request #41 from jimsch/bytescabo2015-09-021-1/+3
| |\
| | * Declare a byte version of the dataJim Schaad2015-09-011-1/+3
| |/
| * Merge pull request #38 from hildjj/mastercabo2015-08-271-1/+4
| |\
| | * Add Slack notifications for Travis buildsJoe Hildebrand2015-08-271-1/+4
| |/
| * Add travis badgeCarsten Bormann2015-08-271-0/+2
| * Merge pull request #37 from hildjj/mastercabo2015-08-271-0/+11
| |\
| | * Simplify Travis build for nowJoe Hildebrand2015-08-271-4/+1
| | * Add .travis.ymlJoe Hildebrand2015-08-271-0/+14
| |/
| * Merge pull request #36 from hildjj/free-rootcabo2015-08-266-19/+23
| |\
| | * docfixJoe Hildebrand2015-08-261-1/+3
| | * Remove extraneous const's, fix tests to match, and add an assert to cn_cbor_f...Joe Hildebrand2015-08-265-18/+19