]> git.ipfire.org Git - pakfire.git/commit
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 27 Sep 2011 14:24:58 +0000 (16:24 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 27 Sep 2011 14:24:58 +0000 (16:24 +0200)
commit1904a7961533d5362a650d09323c7604534bcffd
treefebe5b5a98258f44bf286c124a9a3aecb7d1b3de
parent83e5f0da338f3d736a8230db6196de08225cf4a8
parenta138801474b7695d60831bf51b50a0b96fa25041
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire

Conflicts:
po/pakfire.pot
macros/constants.macro
python/pakfire/base.py
python/pakfire/builder.py
python/pakfire/cli.py
python/pakfire/constants.py
python/pakfire/errors.py
python/pakfire/packages/make.py
scripts/pakfire-multicall.py