Christian Schmidt 80c7f007fe Merge branch 'master' of git://git.ipfire.org/ipfire-2.x ...

Conflicts:
	config/rootfiles/core/49/filelists/files

2011-04-02 19:49:11 +02:00

..

common

Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

2011-04-02 17:56:33 +02:00

core

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

2011-04-02 19:49:11 +02:00

installer

Installer: Add installmedia download support.

2010-11-25 14:18:11 +01:00

oldcore

Merge commit 'origin/core43'

2010-12-03 18:56:37 +01:00

packages

ipfireseeder: update to seed core48.

2011-03-26 14:22:51 +01:00

ver_devel

Rootfiles noch geloescht.

2007-05-06 23:41:49 +00:00

ver_full

Fix cdrom build.

2010-12-18 21:44:24 +01:00