Merge branch 'maint' - pacman - Archlinux32 fork of pacman

Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.

summary refs log tree commit diff

path: root/po/LINGUAS

diff options

author	Dan McGee <dan@archlinux.org>	2010-12-30 09:41:46 -0600
committer	Dan McGee <dan@archlinux.org>	2010-12-30 09:41:46 -0600
commit	08d885fda5c9ccb3ac68faccc7c75e440ac71113 (patch)
tree	3c494d8c593db3848d88a74b4e111710acfe0707 /po/LINGUAS
parent	351250adb49bea470b88fca54dcfba789b58545c (diff)
parent	6ddc115c7f52d6d172ca3879f96cc782bb526313 (diff)

Merge branch 'maint'

Conflicts: lib/libalpm/sync.c test/pacman/tests/ignore007.py

Diffstat (limited to 'po/LINGUAS')

0 files changed, 0 insertions, 0 deletions