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 61c6552862345cb155903cd1566f1cef5c527a94 (commit) via a1f7c83dbf3bce492163362d2896e3a4176be616 (commit) via 6d8a6aef094c162f46a8b9be6a118a502fabca61 (commit) via b99bebc008dcf944a88f99bb44ac9029557e4149 (commit) via a50b067470a8046dabdff66f6266d2208b2f8372 (commit) via 346139298bc547d1cbeb5d41f2067577b96ff1fa (commit) via f7192b595881103f145a118d63d1b342ffd740b4 (commit) from 9394f229a0328228e810b7d4588b24643b42df6a (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 61c6552862345cb155903cd1566f1cef5c527a94 Merge: 9394f229a0328228e810b7d4588b24643b42df6a a1f7c83dbf3bce492163362d2896e3a4176be616 Author: Dan McGee <dan@archlinux.org> Date: Tue Dec 2 22:15:02 2008 -0600 Merge branch 'maint' Conflicts: lib/libalpm/dload.c ----------------------------------------------------------------------- Summary of changes: PKGBUILD.proto | 1 + lib/libalpm/be_files.c | 11 +++++++---- lib/libalpm/delta.c | 15 +++++++++++++++ lib/libalpm/dload.c | 10 ++++------ scripts/makepkg.sh.in | 2 +- src/pacman/callback.c | 1 + src/pacman/pacman.c | 46 ++++++++++++++++++++++++++++++++++------------ src/pacman/sync.c | 3 ++- 8 files changed, 65 insertions(+), 24 deletions(-) hooks/post-receive -- The official pacman repository