diff options
| author | Dan McGee <dan@archlinux.org> | 2009-01-13 07:10:36 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-01-13 07:10:36 +0100 |
| commit | b369f71fd62effa611214f5afc3de8568533253a (patch) | |
| tree | 720d557f939cc2b23415d21adef6895636c6df18 /doc/pacman.conf.5.txt | |
| parent | 3d6da93093caa12f726f723ba19d737c8a55b44d (diff) | |
| parent | 1191303f8b9edc01ff969e2433f5c40c9a95474a (diff) | |
| download | pacman-b369f71fd62effa611214f5afc3de8568533253a.tar.gz pacman-b369f71fd62effa611214f5afc3de8568533253a.tar.xz | |
Merge branch 'maint'
Conflicts:
doc/makepkg.conf.5.txt
Diffstat (limited to 'doc/pacman.conf.5.txt')
| -rw-r--r-- | doc/pacman.conf.5.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 8ef11ecb..fa212947 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -25,6 +25,7 @@ which defines global options. Example ------- + -------- # # pacman.conf |