Michael Tremer dff6612b02 Merge remote-tracking branch 'mfischer/dnsmasq' into next ...

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

Conflicts:
	lfs/dnsmasq

2015-06-18 13:12:33 +02:00

config

dnsmasq: Import patches from upstream

2015-06-18 12:38:38 +02:00

doc

ipsec: Allow selection of ESP group type

2015-06-15 22:33:28 +02:00

html

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

2015-06-17 20:40:14 +02:00

langs

ipsec: Allow selection of ESP group type

2015-06-15 22:33:28 +02:00

lfs

Merge remote-tracking branch 'mfischer/dnsmasq' into next

2015-06-18 13:12:33 +02:00

src

Merge remote-tracking branch 'mfischer/dnsmasq' into next

2015-06-18 13:12:33 +02:00

tools

Add rootfile check for hardcoded machine type.

2015-04-25 13:23:34 +02:00

.gitignore

Buildsystem: generate image md5sums.

2011-01-01 11:40:19 +01:00

.mailmap

Add .mailmap.

2010-01-22 11:37:55 +01:00

make.sh

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

2015-06-17 20:40:14 +02:00

Description

No description provided

101 MiB

Languages

Perl 70.4%

Shell 23%

C 4%

Python 0.6%

Makefile 0.5%

Other 1.4%