[gentoo-commits] proj/glentoo-overlay:master commit in: /

[gentoo-commits] proj/glentoo-overlay:master commit in: /

[Robert Seaton]

commit:     eddf3e39fe6b75ded1cb8fabbc9a5cadd9edbbda
Author:     Robert Seaton <seatonr <AT> dupage <DOT> edu>
AuthorDate: Thu Jun  2 18:08:47 2011 +0000
Commit:     Robert Seaton <seatonr <AT> dupage <DOT> edu>
CommitDate: Thu Jun  2 18:08:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/glentoo-overlay.git;a=commit;h=eddf3e39

Merge remote-tracking branch 'origin/master'

Conflicts:
	sys-kernel/glendix-sources/Manifest
	sys-kernel/glendix-sources/files/glendix_2.6.31.6.patch


 sys-kernel/glendix-sources/Manifest                |    4 +
 .../glendix-sources/files/glendix_2.6.31.6.patch   | 3131 --------------------
 .../glendix-sources-2.6.31.6.ebuild                |   21 -
 3 files changed, 4 insertions(+), 3152 deletions(-)

diff --cc sys-kernel/glendix-sources/Manifest
index 5782049,74cacd0..230eacb
--- a/sys-kernel/glendix-sources/Manifest
+++ b/sys-kernel/glendix-sources/Manifest
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +AUX glendix_2.6.31.6.patch 81712 RMD160 6da3cda1eb720088d6523f116c08bc4071f56a0a SHA1 1ca6418f0cce58f9f4b6e2fabfac6ec51b55cd5f SHA256 84af323f547ac4dbba57748f23702d2b3038d9788fbbec34967f651abeeab0d8
++=======
+ AUX glendix_2.6.31.6.patch 81712 RMD160 b925557fb2318b4955561404c148d8581a2b45c0 SHA1 818ec43dad5de7346602891333d7761504f5ec19 SHA256 d14dea919c5b8ede67c8c59f221729639dae485b45dfe1576d6fcec67cee35ea
++>>>>>>> origin/master
  DIST deblob-2.6.31 80819 RMD160 20972daf3852336198b5e1ac4f95a9d88f5d1d67 SHA1 41070a790894136913469bdcb3433b3d13b3e797 SHA256 4dce1f711d5098430f15ca0664ad3a1ad83a0ce6faf10d0dc8b8f53f2ab655f0
  DIST deblob-check-2.6.31 247608 RMD160 840bf8a229ea79810519eee6241edb85b78a6562 SHA1 d45a24eb16e5ac956c0fcddbc1ac4d67e326c7b8 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3
  DIST linux-2.6.31.tar.bz2 61494822 RMD160 c0d88e63740abf0d4f9d82557260a31643f5a01b SHA1 c6e0e6b473ba2b80d164e37cfabf294e783c03d9 SHA256 0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512
diff --cc sys-kernel/glendix-sources/files/glendix_2.6.31.6.patch
index ad6089d,27b1dcb..0000000
deleted file mode 100644,100644
--- a/sys-kernel/glendix-sources/files/glendix_2.6.31.6.patch
+++ /dev/null
diff --cc sys-kernel/glendix-sources/glendix-sources-2.6.31.6.ebuild
index 5e5fcf1,5e5fcf1..0000000
deleted file mode 100644,100644
--- a/sys-kernel/glendix-sources/glendix-sources-2.6.31.6.ebuild
+++ /dev/null