diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-08 10:54:13 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-08 10:54:13 -0300 |
| commit | e0981df8c5fce1353e1499a5085e27f92afddcea (patch) | |
| tree | 06de6ad8de74d4b7b040d67f050c1fd43fe83a33 /extra/x11vnc | |
| parent | 97a74a6a87ccbeb5649f226377d0c10ae824f1e1 (diff) | |
| parent | 0f9e4ba23bb6296d8bb8010f70d868fd08db9c54 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/curlftpfs/PKGBUILD
core/libcap/PKGBUILD
core/libsasl/PKGBUILD
core/udev/PKGBUILD
extra/cyrus-sasl/PKGBUILD
extra/dbus/PKGBUILD
extra/fluidsynth/PKGBUILD
extra/mercurial/PKGBUILD
extra/redland/PKGBUILD
extra/soprano/PKGBUILD
multilib/lib32-curl/PKGBUILD
multilib/lib32-freetype2/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'extra/x11vnc')
0 files changed, 0 insertions, 0 deletions