diff options
| author | Dan McGee <dan@archlinux.org> | 2010-07-02 18:29:37 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-07-02 18:29:37 -0500 |
| commit | 686b8c146398c5ba9feee2c1fa10bf9e598b2ce8 (patch) | |
| tree | 0353500bc444ac60cef120ea6d722c94badfe8ca /ChangeLog.proto | |
| parent | 1a9db4cac7cf308188298db48dde5d80ce86a7e9 (diff) | |
| parent | fcb4f0264f2b8e0a6ed1e7eebfe00f662ba94ef2 (diff) | |
| download | pacman-686b8c146398c5ba9feee2c1fa10bf9e598b2ce8.tar.xz | |
Merge branch 'maint'
Conflicts:
scripts/makepkg.sh.in
Diffstat (limited to 'ChangeLog.proto')
0 files changed, 0 insertions, 0 deletions