diff options
| author | Dan McGee <dan@archlinux.org> | 2012-01-30 22:00:26 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-01-30 22:00:26 -0600 |
| commit | 4f54bde4390d6d4302273a835e79ab1f2827adf8 (patch) | |
| tree | 6d0484e190ef4927e814524b2b8a46d9aa851315 /doc | |
| parent | 9aa4d9a7b981e48a42203d4c07f729c8b890c62f (diff) | |
| parent | 9d1e8084dfa0a1ebae6c37e3b839289cb905116f (diff) | |
Merge branch 'maint'
Conflicts:
scripts/makepkg.sh.in
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/index.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/index.txt b/doc/index.txt index c36dfbf2..f7a16105 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -256,7 +256,7 @@ Pacman/libalpm frontends: Copyright --------- -pacman is Copyright (C) 2006-2011 Pacman Development Team +pacman is Copyright (C) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org> and Copyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org> and is licensed through the GNU General Public License, version 2 or later. |