summaryrefslogtreecommitdiff
path: root/libre/luxrender-libre
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-04-20 10:57:49 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-04-20 10:57:49 +0200
commit742bd5a396f7a4c474e8ffec0686fc7312603cb8 (patch)
tree4279eed1d5d5c40895c7dcf0025ee62ea81144c1 /libre/luxrender-libre
parenta51b3c4acfc8b2f659ad0dc6ac655b1381bef757 (diff)
parent1f9776d421ac40faa59f797893033e99e4f919eb (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/gsynaptics/PKGBUILD community/xmms2/PKGBUILD extra/gpsd/PKGBUILD
Diffstat (limited to 'libre/luxrender-libre')
0 files changed, 0 insertions, 0 deletions