diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-23 15:47:38 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-23 15:47:38 +0200 |
| commit | 9b5c97532f512463af83f0daac1e9db22c3307c2 (patch) | |
| tree | 582f514a154dea23be340cca8abe44a0bf95f132 /staging/gnome-color-manager/PKGBUILD | |
| parent | f8ec57e91051f85129d837252605854c888567d0 (diff) | |
| parent | 3c19af9355ba86a5b99d6e5a57ecaa68a7ea6e8e (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/cegui/PKGBUILD
community-staging/darktable/PKGBUILD
community-staging/freewrl/PKGBUILD
community-staging/gource/PKGBUILD
community-staging/openimageio/PKGBUILD
community-staging/rss-glx/PKGBUILD
community-staging/spring/PKGBUILD
community-testing/virtualbox-modules/PKGBUILD
community/astromenace/PKGBUILD
extra/di/PKGBUILD
staging/opencv/PKGBUILD
testing/cairo/PKGBUILD
testing/gnome-control-center/PKGBUILD
testing/gtkmm3/PKGBUILD
testing/seahorse/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd.install
Diffstat (limited to 'staging/gnome-color-manager/PKGBUILD')
0 files changed, 0 insertions, 0 deletions