diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-24 11:07:35 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-24 11:07:35 -0300 |
| commit | 8d32e471d53634b308adf93007922a6ccbd2b830 (patch) | |
| tree | 606fdcd5508936ffdfc7cf510a16b7324c2792e2 /staging/avahi/gnome-nettool.png | |
| parent | 4c9d76f582ae64854e30113e7f7dc621af3db820 (diff) | |
| parent | 1e1e4927b05d9b242bfe83794e3a98ab2c8f79ef (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/augeas/PKGBUILD
community/chmsee/PKGBUILD
community/cupsddk/PKGBUILD
community/optipng/PKGBUILD
community/pcb/PKGBUILD
community/taglib-rcc/PKGBUILD
community/wmctrl/PKGBUILD
extra/c-ares/PKGBUILD
multilib/lib32-freetype2/PKGBUILD
Diffstat (limited to 'staging/avahi/gnome-nettool.png')
| -rw-r--r-- | staging/avahi/gnome-nettool.png | bin | 0 -> 4509 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/staging/avahi/gnome-nettool.png b/staging/avahi/gnome-nettool.png Binary files differnew file mode 100644 index 000000000..227d0678a --- /dev/null +++ b/staging/avahi/gnome-nettool.png |