aboutsummaryrefslogtreecommitdiffstats
path: root/main/screen/APKBUILD
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-07-24 08:14:21 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-07-24 08:14:21 +0000
commit7bfea24048690efa8596623e5ad542a7994c6c4d (patch)
tree6bfd51db9acf0b713ca3168e0deb35f30389d423 /main/screen/APKBUILD
parentb70981b68efcce5256eb11c6cd26ae123b10b6ea (diff)
parent6a950ff50d5a74cd7b55d002a53d31d55d2ff2a8 (diff)
downloadaports-7bfea24048690efa8596623e5ad542a7994c6c4d.tar.bz2
aports-7bfea24048690efa8596623e5ad542a7994c6c4d.tar.xz
Merge commit 'remotes/mmason/master'
Conflicts: main/tinyproxy/tinyproxy.install
Diffstat (limited to 'main/screen/APKBUILD')
0 files changed, 0 insertions, 0 deletions