summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-04-07 18:23:55 +0200
committerDan McGee <dan@archlinux.org>2012-04-07 18:23:55 +0200
commit4ca6590af58177964910588a6d0406f0d009bd0e (patch)
tree3ff2d0d07aa5bd38f13e9456c5f831bdef06b8e2 /doc
parent3f1ea8b62f46a915c94a5b46e21ad39ea2628f65 (diff)
parentb752561a52a88f8e9cc3bcc9c2079eb685245110 (diff)
downloadpacman-4ca6590af58177964910588a6d0406f0d009bd0e.tar.gz
pacman-4ca6590af58177964910588a6d0406f0d009bd0e.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/signing.c lib/libalpm/sync.c
Diffstat (limited to 'doc')
-rw-r--r--doc/index.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/index.txt b/doc/index.txt
index 9e94dbb7..d0ac8bac 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.3 !2011-04-07
!4.0.2 !2011-02-11
!4.0.1 !2011-11-20
!4.0.0 !2011-10-13