diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-11 12:04:22 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-11 12:04:22 +0100 |
| commit | 020644b613452cc7ab48474b463e4a9d1088d8a3 (patch) | |
| tree | b1e2ae353ab1f58e0513bf5cef15ea87eacba1ff /community/slock | |
| parent | 9268c5eeb9d68cd786f5a7beaed3b5672adb5287 (diff) | |
| parent | 9d1489b877a1fa7c2674cf1f744804db42d93bfc (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/librep/PKGBUILD
extra/pixman/PKGBUILD
Diffstat (limited to 'community/slock')
0 files changed, 0 insertions, 0 deletions