summaryrefslogtreecommitdiff
path: root/cross
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-02-21 14:08:11 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2013-02-21 14:08:11 +0100
commit33e0fe3d6f416b9e5c69064d1e5f43e0a77e5a06 (patch)
tree68eb8e5aa930fa85c55f1f20af89e0e5537f5460 /cross
parent1638606986baf083ec13fd41989240a2cccff276 (diff)
parent111b18e76114f1a46a23a979a7872e7fda412601 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/bitcoin/PKGBUILD community/luajit/PKGBUILD community/mplayer2/PKGBUILD extra/freeciv/PKGBUILD extra/graphviz/PKGBUILD extra/transmission/PKGBUILD
Diffstat (limited to 'cross')
0 files changed, 0 insertions, 0 deletions