diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-10 11:35:18 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-10 11:35:18 +0200 |
| commit | 51d25a8023c8dafdbcafd8bcc6adb19979f15ac6 (patch) | |
| tree | 3419b254ec8c04b09a938d993fdb768eae03c005 /extra/xorg-setxkbmap | |
| parent | 11fe0679d59f68c3fbe3d0a205e5087bf694262e (diff) | |
| parent | 7b2739f21a7ed0d52497fa381c9a2383e71ab7a8 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/kdemultimedia/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/samba/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/wine/PKGBUILD
staging/kdemultimedia/PKGBUILD
Diffstat (limited to 'extra/xorg-setxkbmap')
0 files changed, 0 insertions, 0 deletions