From: Andrew Gaffney Date: Sun, 21 Dec 2008 22:17:12 +0000 (-0600) Subject: Merge branch 'master' of git+ssh://git@wolf31o2.org/projs/catalyst X-Git-Tag: CATALYST_2_0_6_916~54 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e369f22597bd07e76770bba5b3a94c8f58ecfa0c;p=catalyst.git Merge branch 'master' of git+ssh://git@wolf31o2.org/projs/catalyst Conflicts: ChangeLog --- e369f22597bd07e76770bba5b3a94c8f58ecfa0c diff --cc ChangeLog index 832764e0,c0abbebe..8f60d9c2 --- a/ChangeLog +++ b/ChangeLog @@@ -1,16 -1,9 +1,19 @@@ # Copyright 2002-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney # Distributed under the GPL v2 + 21 Dec 2008; Andrew Gaffney + -livecd/cdtar/isolinux-3.09-cdtar.tar.bz2, + -livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2: + Remove old isolinux-3.09 cdtar files + + 21 Dec 2008; Andrew Gaffney + +livecd/cdtar/isolinux-3.72-cdtar.tar.bz2, + +livecd/cdtar/isolinux-3.72-memtest86+-cdtar.tar.bz2: + Update cdtar files to isolinux-3.72 and latest memtest86+-2.10 + + 19 Dec 2008; Chris Gianelloni catalyst: + Marking this 2.0.6.903 for testing. + 12 Dec 2008; Andrew Gaffney targets/netboot2/netboot2-controller.sh: Disable copying of nb-busybox.cf since it isn't used anyway