This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 11fb9c767450dc193bbeef755c228aa620df75d9 (commit) via f2c4e7e55220addef0581d1c38cc7363b5a0884c (commit) via ba467779bb0faa6ea81d91759c2224592091bbe3 (commit) via aec60e37822509a1ca7fc53244878d3f1505d964 (commit) via 93f02f5793ad7907aa0bc7c4a9fe64f0c7ce86f6 (commit) via 3000b6b473422dca3670c922c24d0e15e963281a (commit) via ac6f6b317ae4bb7adf5ea08fbad6a75f024ff75a (commit) via b9a2318becfc9d6ffb92e602adf433faa8cec383 (commit) from 70cf4546d6d35ef9ef2751f37853cde679c88aa7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 11fb9c767450dc193bbeef755c228aa620df75d9 Merge: 70cf454 f2c4e7e Author: Dan McGee <dan@archlinux.org> Date: Thu May 19 17:17:32 2011 -0500 Merge branch 'maint' Conflicts: lib/libalpm/trans.c src/pacman/query.c ----------------------------------------------------------------------- Summary of changes: lib/libalpm/remove.c | 2 +- lib/libalpm/trans.c | 19 +++++++++-------- po/fi.po | 15 +++++++------ src/pacman/pacman.c | 5 ++- src/pacman/query.c | 4 +++ test/pacman/pmpkg.py | 2 +- test/pacman/pmrule.py | 8 +++++++ test/pacman/tests/symlink002.py | 43 +++++++++++++++++++++++++++++++++++++++ test/pacman/util.py | 6 +--- 9 files changed, 80 insertions(+), 24 deletions(-) create mode 100644 test/pacman/tests/symlink002.py hooks/post-receive -- The official pacman repository