Merge branch 'bacula' of github.com:morlix/ipfire-2.x into bacula

Browse Source

Conflicts:
	make.sh

...

This commit is contained in:

Timo Eissler

2014-07-15 21:12:51 +02:00

parent 008c392e78 469f20cdf7

commit e405fe9e3a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available