diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-17 12:10:05 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-17 12:10:05 +0200 |
| commit | f5960fe27a2d814eab2ac7efacd714322c18a7b7 (patch) | |
| tree | 4961d39c9af71f05b5b6ba9f4a23c47963193d37 /core/nano | |
| parent | 1d26d40c2055019b7eb001251919aa73baae0029 (diff) | |
| parent | 74952c750361d72d7b2d14179d4e88b6ce0a0c7e (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bsdiff/PKGBUILD
community/drivel/PKGBUILD
community/dvdbackup/PKGBUILD
community/gdlmm/PKGBUILD
community/gnome-phone-manager/PKGBUILD
community/highlight/PKGBUILD
community/i3-wm/PKGBUILD
community/linux-tools/PKGBUILD
community/obconf/PKGBUILD
community/perl-class-factory-util/PKGBUILD
community/python-mpi4py/PKGBUILD
community/qupzilla/PKGBUILD
community/subtitleeditor/PKGBUILD
community/synce-librapi/PKGBUILD
community/synce-libsynce/PKGBUILD
community/tilda/PKGBUILD
core/glibc/PKGBUILD
core/iputils/PKGBUILD
extra/alsa-tools/PKGBUILD
extra/calligra/PKGBUILD
extra/imagemagick/PKGBUILD
extra/kobodeluxe/PKGBUILD
extra/libburn/PKGBUILD
extra/libisoburn/PKGBUILD
extra/libisofs/PKGBUILD
extra/libsamplerate/PKGBUILD
extra/mariadb/PKGBUILD
extra/maxima/PKGBUILD
extra/nasm/PKGBUILD
extra/perl-netaddr-ip/PKGBUILD
extra/perl-template-toolkit/PKGBUILD
extra/putty/PKGBUILD
extra/samba/PKGBUILD
extra/tk/PKGBUILD
extra/vim/PKGBUILD
extra/xorg-xprop/PKGBUILD
extra/xorg-xwd/PKGBUILD
pcr/ams/PKGBUILD
pcr/clalsadrv/PKGBUILD
Diffstat (limited to 'core/nano')
0 files changed, 0 insertions, 0 deletions