diff options
author | Carlo Landmeter <clandmeter@gmail.com> | 2010-09-20 23:09:58 +0000 |
---|---|---|
committer | Carlo Landmeter <clandmeter@gmail.com> | 2010-09-20 23:09:58 +0000 |
commit | 6bd42c0af8a556f39af2abc12eff32e422b420c1 (patch) | |
tree | 91accbeb5da040d149d0c39b3594c4132e12d711 /main/encodings | |
parent | 7174c85c21c4990b52286802294cae5c380ca04f (diff) | |
parent | 729073e0d5cb8dc14327672efe8f1018f9c31205 (diff) | |
download | aports-6bd42c0af8a556f39af2abc12eff32e422b420c1.tar.bz2 aports-6bd42c0af8a556f39af2abc12eff32e422b420c1.tar.xz |
Merge branch 'master' into eglibc
Conflicts:
main/abuild/APKBUILD
main/faac/APKBUILD
main/gcc/APKBUILD
Diffstat (limited to 'main/encodings')
0 files changed, 0 insertions, 0 deletions