summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-01-03 02:44:00 +0100
committerDan McGee <dan@archlinux.org>2012-01-03 02:44:00 +0100
commit6513b0ba591e44b4da75aa924046a34b8a269e9d (patch)
tree47935e981488774741dcc4d8dc71d4a5ecef69ba /scripts
parent0b9cd9448c16dcf5e21ee8822698dbe908db520f (diff)
parentf1d9b0a74a9e38dc9e6153eac76f4c2482fd24aa (diff)
downloadpacman-6513b0ba591e44b4da75aa924046a34b8a269e9d.tar.gz
pacman-6513b0ba591e44b4da75aa924046a34b8a269e9d.tar.xz
Merge branch 'maint'
Conflicts: doc/Makefile.am
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions