diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-20 12:35:17 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-20 12:35:17 +0200 |
| commit | dd20ac40523cf27f69f10087655ccb3c0f318a9b (patch) | |
| tree | bfa47cd682339a5732821d9d693ef3cd0d02f898 /extra/gconf-editor | |
| parent | b17208557669f7d787c139c7f15913be60db7b1b (diff) | |
| parent | 1ae31a85e191bbf7313077b472a66d1c24af1f74 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/agsync/PKGBUILD
community/synce-serial/PKGBUILD
community/synce-vdccm/PKGBUILD
core/lvm2/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/sqlite/PKGBUILD
Diffstat (limited to 'extra/gconf-editor')
0 files changed, 0 insertions, 0 deletions