diff options
author | Dan McGee <dan@archlinux.org> | 2012-02-13 10:12:39 -0600 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2012-02-13 10:14:06 -0600 |
commit | c7321a7b80aebeacb05ad5ab9d096779403b1758 (patch) | |
tree | 8fa7f16abc7b7af0c24ba92ababfc5c145d35eed /doc | |
parent | 115c0381c235100d7b05d9751767017a9ee325c4 (diff) | |
parent | b4f5a63e7fee5d04949e290bd63e5f0e94bd211e (diff) | |
download | pacman-c7321a7b80aebeacb05ad5ab9d096779403b1758.tar.xz |
Merge branch 'maint'
Conflicts:
lib/libalpm/sync.c
src/util/pactree.c
Diffstat (limited to 'doc')
-rw-r--r-- | doc/index.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/index.txt b/doc/index.txt index f7a16105..b221d237 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -71,6 +71,7 @@ Releases [frame="topbot",grid="none",options="header,autowidth"] !====== !Version !Date +!4.0.2 !2011-02-11 !4.0.1 !2011-11-20 !4.0.0 !2011-10-13 !4.0.0rc2 !2011-09-22 |