diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-04 16:44:12 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-04 16:44:12 +0200 |
| commit | c24d2623d795ac7ee5435b56dd6e413e3cbd2f69 (patch) | |
| tree | 36fd6f84a97f0ee7bde3592ea33176d1b98d64eb /.hgignore | |
| parent | d2e9c77d6881eb7ef37edf747a77f83168bbe9b7 (diff) | |
| parent | 1b6860ed7a33a22c4202348a4f42afbb5d26be09 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/celt-0.7/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD
extra/gnome-media/PKGBUILD
extra/libgnome-media-profiles/PKGBUILD
extra/libwebp/PKGBUILD
extra/telepathy-kde-desktop-applets/PKGBUILD
extra/telepathy-kde-presence-applet/PKGBUILD
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions