summaryrefslogtreecommitdiff
path: root/extra/gnome-robots
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-06-01 10:28:14 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-06-01 10:28:14 +0200
commit6142d9bb383134a876709765fed704815922db18 (patch)
tree9bbbb78a5ce1f8473dbae502634253f80a994331 /extra/gnome-robots
parent0dc1411695376442c13f473499a876f085074d75 (diff)
parentf8a7f10fa1675bee536e1fdb4672c3d84e779d1c (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/aircrack-ng/PKGBUILD community/fortune-mod/PKGBUILD community/hping/PKGBUILD community/iftop/PKGBUILD community/uml_utilities/PKGBUILD community/unhide/PKGBUILD extra/kismet/PKGBUILD extra/liblo/PKGBUILD extra/libxinerama/PKGBUILD extra/libxp/PKGBUILD extra/libxres/PKGBUILD extra/libxt/PKGBUILD extra/libxtst/PKGBUILD extra/libxxf86vm/PKGBUILD extra/mtr/PKGBUILD extra/transmission/PKGBUILD
Diffstat (limited to 'extra/gnome-robots')
0 files changed, 0 insertions, 0 deletions