[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.1-70-ge49adbe

[Dan McGee]

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  e49adbea4c67b2fd49910697229682e0a85fe9b2 (commit)
       via  f8b689d48eb34cf81c22c854cd83595338d49d44 (commit)
       via  c31fcfd833fc527a3774c7b1bc29686194d23942 (commit)
       via  cb03817ee85905db8a06278f1f7efaa3e9174bf9 (commit)
       via  bd2de5cdf6e1773e0d661683eed315a3e5261f77 (commit)
       via  2f59996c54da473294de4adf44d521299a045a84 (commit)
       via  f4651c49af94164f2c129ea6eb3d78b86be4d5bc (commit)
       via  751d37e749fcb0a06bb21dee4b5b6d0b062ed284 (commit)
       via  08980fb4bcf4078b4b22b2c1f6f36cbbdee89ec4 (commit)
       via  cc7f3b705e1c3a1fdc356942134456559ce69230 (commit)
       via  89b0a76b3cd6840731f856b358e33d5771e9e1c5 (commit)
      from  bd628274cc8db81704860e69894fcd217c2068d0 (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 e49adbea4c67b2fd49910697229682e0a85fe9b2
Author: Dan McGee <dan at archlinux.org>
Date:   Fri Jan 2 22:49:51 2009 -0600

    Add a .gitattributes file
    
    This will make python diffs prettier.
    
    Signed-off-by: Dan McGee <dan at archlinux.org>

commit f8b689d48eb34cf81c22c854cd83595338d49d44
Merge: bd628274cc8db81704860e69894fcd217c2068d0 c31fcfd833fc527a3774c7b1bc29686194d23942
Author: Dan McGee <dan at archlinux.org>
Date:   Fri Jan 2 22:48:52 2009 -0600

    Merge branch 'maint'
    
    Conflicts:
    	lib/libalpm/dload.c
    	po/it.po
    	scripts/makepkg.sh.in

-----------------------------------------------------------------------

Summary of changes:
 .gitattributes        |    1 +
 doc/Makefile.am       |    1 +
 doc/PKGBUILD.5.txt    |   11 ++--
 doc/makepkg.8.txt     |    2 +-
 lib/libalpm/dload.c   |    6 ++
 po/cs.po              |   66 ++++++++++++++++++--------
 po/de.po              |   72 +++++++++++++++++++----------
 po/en_GB.po           |   66 ++++++++++++++++++--------
 po/es.po              |   74 +++++++++++++++++++----------
 po/fr.po              |   71 +++++++++++++++++++---------
 po/hu.po              |   61 ++++++++++++++++--------
 po/pacman.pot         |   48 ++++++++++++--------
 po/pl.po              |   68 ++++++++++++++++++---------
 po/pt_BR.po           |   70 +++++++++++++++++++---------
 po/ru.po              |   74 +++++++++++++++++++----------
 po/tr.po              |   70 +++++++++++++++++++---------
 po/uk.po              |   69 +++++++++++++++++++---------
 po/zh_CN.po           |   44 ++++++++++++++----
 scripts/Makefile.am   |    3 +-
 scripts/makepkg.sh.in |  123 +++++++++++++++++++++++++++++++++++++++++++------
 20 files changed, 701 insertions(+), 299 deletions(-)
 create mode 100644 .gitattributes


hooks/post-receive
--
The official pacman repository