fixed conflicts

This commit is contained in:
strawmanbobi
2019-02-24 22:47:11 +08:00
896 changed files with 13626 additions and 366405 deletions

1
.gitignore vendored
View File

@@ -1,3 +1,4 @@
/accessories
/in_progress
stm8-driver/settings/STM8_Driver.wsdt
stm8-driver/STM8_Driver.dep

0
android-example/.gitignore vendored Executable file → Normal file
View File

0
android-example/README.md Executable file → Normal file
View File

0
android-example/app/.gitignore vendored Executable file → Normal file
View File

0
android-example/app/build.gradle Executable file → Normal file
View File

0
android-example/app/libs/web-api.aar Executable file → Normal file
View File

0
android-example/app/proguard-rules.pro vendored Executable file → Normal file
View File

0
android-example/app/src/main/AndroidManifest.xml Executable file → Normal file
View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

0
android-example/app/src/main/res/layout/item_brand.xml Executable file → Normal file
View File

View File

0
android-example/app/src/main/res/layout/item_city.xml Executable file → Normal file
View File

0
android-example/app/src/main/res/layout/item_index.xml Executable file → Normal file
View File

View File

View File

0
android-example/app/src/main/res/layout/ptr_header.xml Executable file → Normal file
View File

0
android-example/app/src/main/res/menu/menu_main.xml Executable file → Normal file
View File

View File

Before

Width:  |  Height:  |  Size: 400 B

After

Width:  |  Height:  |  Size: 400 B

View File

Before

Width:  |  Height:  |  Size: 661 B

After

Width:  |  Height:  |  Size: 661 B

View File

Before

Width:  |  Height:  |  Size: 304 B

After

Width:  |  Height:  |  Size: 304 B

View File

Before

Width:  |  Height:  |  Size: 511 B

After

Width:  |  Height:  |  Size: 511 B

View File

Before

Width:  |  Height:  |  Size: 860 B

After

Width:  |  Height:  |  Size: 860 B

View File

Before

Width:  |  Height:  |  Size: 654 B

After

Width:  |  Height:  |  Size: 654 B

View File

Before

Width:  |  Height:  |  Size: 269 B

After

Width:  |  Height:  |  Size: 269 B

View File

Before

Width:  |  Height:  |  Size: 241 B

After

Width:  |  Height:  |  Size: 241 B

View File

Before

Width:  |  Height:  |  Size: 463 B

After

Width:  |  Height:  |  Size: 463 B

View File

Before

Width:  |  Height:  |  Size: 256 B

After

Width:  |  Height:  |  Size: 256 B

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 607 B

After

Width:  |  Height:  |  Size: 607 B

View File

Before

Width:  |  Height:  |  Size: 596 B

After

Width:  |  Height:  |  Size: 596 B

View File

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

View File

Before

Width:  |  Height:  |  Size: 451 B

After

Width:  |  Height:  |  Size: 451 B

0
android-example/app/src/main/res/values-v21/styles.xml Executable file → Normal file
View File

View File

View File

0
android-example/app/src/main/res/values/colors.xml Executable file → Normal file
View File

0
android-example/app/src/main/res/values/dimens.xml Executable file → Normal file
View File

View File

0
android-example/app/src/main/res/values/strings.xml Executable file → Normal file
View File

0
android-example/app/src/main/res/values/styles.xml Executable file → Normal file
View File

0
android-example/build.gradle Executable file → Normal file
View File

0
android-example/decodesdk/.gitignore vendored Executable file → Normal file
View File

0
android-example/decodesdk/README.md Executable file → Normal file
View File

0
android-example/decodesdk/build.gradle Executable file → Normal file
View File

0
android-example/decodesdk/ir_decoder/Android.mk Executable file → Normal file
View File

0
android-example/decodesdk/ir_decoder/Application.mk Executable file → Normal file
View File

View File

View File

View File

View File

View File

View File

View File

0
android-example/decodesdk/ir_decoder/include/ir_defs.h Executable file → Normal file
View File

View File

View File

0
android-example/decodesdk/ir_decoder/jni/Readme.md Executable file → Normal file
View File

View File

View File

Some files were not shown because too many files have changed in this diff Show More