git.ipfire.org Git - people/stevee/pakfire.git/commit

]> git.ipfire.org Git - people/stevee/pakfire.git/commit

projects / people / stevee / pakfire.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 677ff42 a727777)

author	Michael Tremer <michael.tremer@ipfire.org>
	Wed, 6 Apr 2011 11:23:08 +0000 (13:23 +0200)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Wed, 6 Apr 2011 11:23:08 +0000 (13:23 +0200)
commit	ffba93f0945c9682e31e604a03bb89abc5a3c5e6
tree	a3a3113a7650db2105f387e783a444f259ac15a2	tree
parent	677ff42a00ef7a791bb5c39fb724b4c255f22440	commit \| diff
parent	a72777775f9f3d091f286895d63c5e82e96be2d0	commit \| diff

Merge branch 'master' of git://git.ipfire.org/oddments/pakfire into server

Conflicts:
pakfire/packages/base.py

pakfire/__init__.py	diff1 \|	diff2 \|	blob \| history
pakfire/builder.py	diff1 \|	diff2 \|	blob \| history
pakfire/cli.py	diff1 \|	diff2 \|	blob \| history
pakfire/packages/base.py	diff1 \|	diff2 \|	blob \| history
pakfire/packages/packager.py	diff1 \|	diff2 \|	blob \| history
pakfire/repository/__init__.py	diff1 \|	diff2 \|	blob \| history
pakfire/repository/local.py	diff1 \|	diff2 \|	blob \| history
pakfire/util.py	diff1 \|	diff2 \|	blob \| history

Stefan's tree of pakfire.