diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-24 11:05:09 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-24 11:05:09 +0100 |
| commit | a98f27a2a1e717afe20483ffa974d542cf80f4d9 (patch) | |
| tree | 9e0b5e5e61843b4b7135423f5151e1f595d47193 /extra/emacs | |
| parent | 9865b00e684520710b6f685aae18fe7681396b65 (diff) | |
| parent | adac5afd500d4ee3a65035e1cf5353ae236b4a61 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ocaml-findlib/PKGBUILD
gnome-unstable/clutter/PKGBUILD
gnome-unstable/gcalctool/PKGBUILD
gnome-unstable/gnome-screensaver/PKGBUILD
gnome-unstable/gnome-screensaver/gnome-screensaver.pam
gnome-unstable/pygobject/PKGBUILD
kde-unstable/calligra/PKGBUILD
Diffstat (limited to 'extra/emacs')
0 files changed, 0 insertions, 0 deletions