Merge remote branch 'internal/upstream' into HEAD
Conflicts: configure
No related branches found
No related tags found
Showing
- AUTHORS 22 additions, 2 deletionsAUTHORS
- CHANGELOG 15 additions, 0 deletionsCHANGELOG
- LICENSE 12 additions, 30 deletionsLICENSE
- PATENTS 22 additions, 0 deletionsPATENTS
- README 3 additions, 3 deletionsREADME
- args.c 5 additions, 4 deletionsargs.c
- args.h 5 additions, 4 deletionsargs.h
- build/.gitattributes 2 additions, 0 deletionsbuild/.gitattributes
- build/arm-wince-vs8/.gitattributes 0 additions, 1 deletionbuild/arm-wince-vs8/.gitattributes
- build/arm-wince-vs8/obj_int_extract.bat 6 additions, 5 deletionsbuild/arm-wince-vs8/obj_int_extract.bat
- build/arm-wince-vs8/vpx.sln 1 addition, 1 deletionbuild/arm-wince-vs8/vpx.sln
- build/make/Makefile 23 additions, 21 deletionsbuild/make/Makefile
- build/make/ads2gas.pl 5 additions, 4 deletionsbuild/make/ads2gas.pl
- build/make/ads2gas_apple.pl 5 additions, 4 deletionsbuild/make/ads2gas_apple.pl
- build/make/armlink_adapter.sh 5 additions, 4 deletionsbuild/make/armlink_adapter.sh
- build/make/configure.sh 24 additions, 14 deletionsbuild/make/configure.sh
- build/make/gen_asm_deps.sh 5 additions, 4 deletionsbuild/make/gen_asm_deps.sh
- build/make/gen_msvs_def.sh 5 additions, 4 deletionsbuild/make/gen_msvs_def.sh
- build/make/gen_msvs_proj.sh 22 additions, 18 deletionsbuild/make/gen_msvs_proj.sh
- build/make/gen_msvs_sln.sh 13 additions, 9 deletionsbuild/make/gen_msvs_sln.sh
Loading
Please register or sign in to comment