| /AliOS-Things-master/documentation/developer/ |
| A D | contribute_code.md | 88 $ git merge upstream/rel_3.3.0 #合并AliOS Things/<TARGET>的更新至本地
90 如果merge过程中，代码有冲突，需要解决所有代码冲突以后，才能提交。
|
| /AliOS-Things-master/components/littlevgl/ |
| A D | LICENCE.txt | 4 …estriction, including without limitation the rights to use, copy, modify, merge, publish, distribu…
|
| /AliOS-Things-master/components/py_engine/engine/tools/mpremote/ |
| A D | LICENSE | 8 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
| /AliOS-Things-master/components/amp/engine/quickjs_engine/quickjs/ |
| A D | LICENSE | 8 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
| A D | TODO | 9 - add index in JSVarDef and is_arg flag to merge args and vars in JSFunctionDef
|
| /AliOS-Things-master/components/SDL2/src/image/external/libpng-1.6.37/contrib/pngminus/ |
| A D | LICENSE.txt | 9 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
| /AliOS-Things-master/components/py_engine/engine/lib/libm_dbl/ |
| A D | README | 21 without limitation the rights to use, copy, modify, merge, publish,
|
| /AliOS-Things-master/components/mbedtls/library/ |
| A D | x509.c | 740 unsigned char c, merge = 0; in mbedtls_x509_dn_gets() local
761 ret = mbedtls_snprintf( p, n, merge ? " + " : ", " ); in mbedtls_x509_dn_gets()
787 merge = name->next_merged; in mbedtls_x509_dn_gets()
|
| /AliOS-Things-master/components/py_engine/engine/py/ |
| A D | dynruntime.mk | 145 $(Q)$(MPY_TOOL) --merge -o $@ $^
|
| /AliOS-Things-master/components/freetype/src/bdf/ |
| A D | README | 103 without limitation the rights to use, copy, modify, merge, publish,
127 the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
| /AliOS-Things-master/components/jsoncpp/ |
| A D | LICENSE | 32 modify, merge, publish, distribute, sublicense, and/or sell copies
|
| /AliOS-Things-master/components/freetype/src/pcf/ |
| A D | README | 74 without limitation the rights to use, copy, modify, merge, publish,
|
| /AliOS-Things-master/components/lwip/lwip2.0.0/netif/ppp/ |
| A D | PPPD_FOLLOWUP | 6 is happening on their side and merge what is relevant for lwIP.
370 We didn't merge 08ef47ca ;-)
|
| /AliOS-Things-master/components/littlevgl/docs/ |
| A D | CONTRIBUTING.md | 36 4. **Set the base branch**. It means where you want to merge your update. Fixes go to `master`, new…
|
| /AliOS-Things-master/components/py_engine/engine/tools/ |
| A D | ci.sh | 59 git checkout `git merge-base --fork-point upstream/master pull_request`
|
| A D | mpy-tool.py | 1040 elif args.merge:
|
| /AliOS-Things-master/components/SDL2/src/image/external/libwebp-1.0.2/ |
| A D | ChangeLog | 454 833c9219 More efficient stochastic histogram merge.
455 5183326b Refactor the greedy histogram merge.
467 868aa690 Perform greedy histogram merge in a unified way.
1664 abf04205 Enable entropy based merge histo for (q<100)
2810 ec2030a8 merge two lines together
3038 73ba4357 Merge "detect and merge similar segments"
3039 fee66275 detect and merge similar segments
3381 c6882c49 merge all tree processing into a single VP8LProcessTree()
3871 f7d9e261 fix merge problems
3878 e7ff3f9a merge two ITransforms together when applicable and change the TTransform to return the sum…
|
| /AliOS-Things-master/components/SDL2/src/gfx/Docs/html/ |
| A D | jquery.js | 12 …merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFil…
|
| /AliOS-Things-master/components/SDL2/src/image/external/jpeg-9b/ |
| A D | structure.txt | 452 merge dequantization and inverse DCT into a single step for speed reasons.
486 Not quite clear yet how this should be handled... should we merge it with
|
| /AliOS-Things-master/components/SDL2/src/image/external/zlib-1.2.11/ |
| A D | ChangeLog | 1328 - work around an MWKERKS bug (incorrect merge of all .h files)
|