diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-14 15:29:39 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-14 15:29:39 +0200 |
| commit | fbb44a6e0d5d3c386420dded0442f4771dbaea7c (patch) | |
| tree | e704eb9c6debe0cf600f2a8f65cd50b8ddce9e14 /doc/asciidoc.conf | |
| parent | 00a1b1deeb390d99c99d942ef4d8bfe1a943b02a (diff) | |
| parent | 07e97a5f2c1e1039f35a7893d2be6abf07af690a (diff) | |
| download | pacman-fbb44a6e0d5d3c386420dded0442f4771dbaea7c.tar.gz pacman-fbb44a6e0d5d3c386420dded0442f4771dbaea7c.tar.xz | |
Merge branch 'maint'
Conflicts:
doc/makepkg.conf.5.txt
Diffstat (limited to 'doc/asciidoc.conf')
0 files changed, 0 insertions, 0 deletions