diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-06 10:25:36 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-06 10:25:36 +0200 |
| commit | 5f875caf9e31730faff78cfa1fc99c30717a924d (patch) | |
| tree | 64da821f3be8e6f7a61a55ae2aa3d7de5ad33e89 /community/keepassx | |
| parent | a791587b609550b73cd867a642338769dc7c117d (diff) | |
| parent | d9c1fc1bcca8fd5cd3566fc6b183fe23065778bc (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/rsyslog/PKGBUILD
extra/boost/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdegames/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdepim/PKGBUILD
libre/kdenetwork-libre/PKGBUILD
multilib/lib32-expat/PKGBUILD
multilib/lib32-libldap/PKGBUILD
multilib/lib32-openal/PKGBUILD
multilib/lib32-p11-kit/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
testing/pcmciautils/PKGBUILD
testing/systemd/PKGBUILD
testing/util-linux/PKGBUILD
Diffstat (limited to 'community/keepassx')
0 files changed, 0 insertions, 0 deletions