diff options
author | James Meyer <james.meyer@operamail.com> | 2011-10-21 21:25:15 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2011-10-21 21:25:15 (GMT) |
commit | 6c1420f821f1c1a7268fd2c8beb68ace8f0ffa47 (patch) | |
tree | 9f82f6fea66b8c7dbdf440dc858e594ae38bc107 /abs/extra/asciidoc/ChangeLog | |
parent | 9eef516e0aeb596daff3c8911055c5a2a8f4e143 (diff) | |
parent | 1ba35589c55706d70c7837262da4177586ddf5a6 (diff) | |
download | linhes_pkgbuild-6c1420f821f1c1a7268fd2c8beb68ace8f0ffa47.zip linhes_pkgbuild-6c1420f821f1c1a7268fd2c8beb68ace8f0ffa47.tar.gz linhes_pkgbuild-6c1420f821f1c1a7268fd2c8beb68ace8f0ffa47.tar.bz2 |
Merge branch 'testing' of ssh://jams@linhes.org/mount/repository/linhes_pkgbuild into testing
Conflicts:
abs/core/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/extra/asciidoc/ChangeLog')
0 files changed, 0 insertions, 0 deletions