From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <noreply@github.com>
Received: from smtp1-ext.rs.github.com (smtp1-ext.rs.github.com
	[207.97.227.250])
	by huchra.bufferbloat.net (Postfix) with ESMTP id D7D7C21F0EA
	for <cerowrt-commits@lists.bufferbloat.net>;
	Sun,  7 Oct 2012 21:21:17 -0700 (PDT)
Received: from github.com (sh2.rs.github.com [50.57.128.197])
	by smtp1-ext.rs.github.com (Postfix) with ESMTP id BD69B43367
	for <cerowrt-commits@lists.bufferbloat.net>;
	Sun,  7 Oct 2012 21:21:16 -0700 (PDT)
Date: Sun, 07 Oct 2012 21:21:16 -0700
From: GitHub <noreply@github.com>
To: cerowrt-commits@lists.bufferbloat.net
Message-ID: <507254bc9ecf4_43c0141bae46739@sh2.rs.github.com.mail>
Subject: [dtaht/ceropackages-3.3] da77c5: Added hopefully final credits file
	(for now)
Mime-Version: 1.0
Content-Type: multipart/mixed;
	boundary="--==_mimepart_507254bc9be8f_43c0141bae467160";
	charset=UTF-8
Content-Transfer-Encoding: 7bit
X-BeenThere: cerowrt-commits@lists.bufferbloat.net
X-Mailman-Version: 2.1.13
Precedence: list
Reply-To: GitHub <noreply@github.com>
List-Id: Development commits for the cerowrt project
	<cerowrt-commits.lists.bufferbloat.net>
List-Unsubscribe: <https://lists.bufferbloat.net/options/cerowrt-commits>,
	<mailto:cerowrt-commits-request@lists.bufferbloat.net?subject=unsubscribe>
List-Archive: <https://lists.bufferbloat.net/pipermail/cerowrt-commits>
List-Post: <mailto:cerowrt-commits@lists.bufferbloat.net>
List-Help: <mailto:cerowrt-commits-request@lists.bufferbloat.net?subject=help>
List-Subscribe: <https://lists.bufferbloat.net/listinfo/cerowrt-commits>,
	<mailto:cerowrt-commits-request@lists.bufferbloat.net?subject=subscribe>
X-List-Received-Date: Mon, 08 Oct 2012 04:21:18 -0000



----==_mimepart_507254bc9be8f_43c0141bae467160
Date: Sun, 07 Oct 2012 21:21:16 -0700
Mime-Version: 1.0
Content-Type: text/plain;
 charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-ID: <507254bc9dc32_43c0141bae46723d@sh2.rs.github.com.mail>

  Branch: refs/heads/master
  Home:   https://github.com/dtaht/ceropackages-3.3
  Commit: da77c5d8546bb85c6b17e270f6c1680c793fb447
      https://github.com/dtaht/ceropackages-3.3/commit/da77c5d8546bb85c6b17e270f6c1680c793fb447
  Author: Dave Taht <dave.taht@bufferbloat.net>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M utils/cerowrt-chrome/files/etc/cerowrt/credits.html

  Log Message:
  -----------
  Added hopefully final credits file (for now)


  Commit: 2f4d7f1340ccd4e76f7431c06d5dafeb1627016d
      https://github.com/dtaht/ceropackages-3.3/commit/2f4d7f1340ccd4e76f7431c06d5dafeb1627016d
  Author: Dave Taht <dave.taht@bufferbloat.net>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    A net/babelm/Makefile
    A net/babelm/files/babeld.conf
    A net/babelm/files/babeld.config
    A net/babelm/files/babeld.init
    A net/babelm/patches/0001-Mark-packets-as-ECN-capable.patch
    R net/babelz/Makefile
    R net/babelz/files/babeld.conf
    R net/babelz/files/babeld.config
    R net/babelz/files/babeld.init
    R net/babelz/patches/0001-Mark-packets-as-ECN-capable.patch
    M net/bind-latest/Makefile
    M net/debloat/Makefile
    M net/debloat/files/debloat
    M net/debloat/files/debloat.hotplug
    A net/debloat/files/simple_qos.sh
    M net/kmod-tcp-ledbat/Makefile
    R net/kmod-tcp-ledbat/patches/0001-Disable-debugging-by-default.patch
    A net/minissdpd/Makefile
    A net/minissdpd/files/minissdpd.config
    A net/minissdpd/files/minissdpd.iface.hotplug
    A net/minissdpd/files/minissdpd.init
    M net/miniupnpd/Makefile
    M net/miniupnpd/files/miniupnpd.iface.hotplug
    M net/miniupnpd/files/miniupnpd.init
    M net/netperf-latest/Makefile
    M net/ntpd/Makefile
    M net/openhip/Makefile
    M net/polipo/Makefile
    M net/quagga/Makefile
    M net/quagga/files/babeld.conf
    A net/quagga/patches/900-Arbitrarily-ECN-enable-babel.patch
    A net/scamper/patches/002-ecn-detect.patch
    M utils/gnugol/Makefile

  Log Message:
  -----------
  Merge branch 'master' of github.com:dtaht/ceropackages-3.3

Conflicts:
	utils/cerowrt-chrome/files/etc/cerowrt/credits.html


Compare: https://github.com/dtaht/ceropackages-3.3/compare/2b70ca439d65...2f4d7f1340cc

----==_mimepart_507254bc9be8f_43c0141bae467160--