summaryrefslogtreecommitdiff
path: root/elementary
diff options
context:
space:
mode:
authorMárcio Alexandre Silva Delgado <coadde@adinet.com.uy>2012-08-01 21:36:53 -0300
committerMárcio Alexandre Silva Delgado <coadde@adinet.com.uy>2012-08-01 21:36:53 -0300
commit7e00045a605d554cdf361c2794b8b600ed940fdb (patch)
tree539341434b5684275e1a90b6939721ff74312ed1 /elementary
parent283ba6b5f63103403e4b908aa5c3d1b12eb6a689 (diff)
parent62a0b15275fa1f33b1f1108e3908d1875c139a77 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Conflicts: libre/luxrays-libre/PKGBUILD
Diffstat (limited to 'elementary')
0 files changed, 0 insertions, 0 deletions