[SM-Commit] GIT changes to master z-rejected grimoire by Jaka Kranjc (23d4c1a2dd616270fd1af81dd7a381191f848967)

Jaka Kranjc scm at mail.sourcemage.org
Fri Feb 16 16:32:09 EST 2007


GIT changes to master z-rejected grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 z-kernels/ipw2100/CONFLICTS |    3 +--
 z-kernels/ipw2100/HISTORY   |    3 +++
 z-kernels/ipw2200/CONFLICTS |    3 +--
 z-kernels/ipw2200/HISTORY   |    3 +++
 4 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 23d4c1a2dd616270fd1af81dd7a381191f848967
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    forgot to commit these CD parts

diff --git a/z-kernels/ipw2100/CONFLICTS b/z-kernels/ipw2100/CONFLICTS
index 5d50142..2f35f5a 100755
--- a/z-kernels/ipw2100/CONFLICTS
+++ b/z-kernels/ipw2100/CONFLICTS
@@ -1,2 +1 @@
-conflicts ipw2100_firmware y &&
-conflicts ipw2100_driver y  
+conflicts ipw2100_firmware y
diff --git a/z-kernels/ipw2100/HISTORY b/z-kernels/ipw2100/HISTORY
index 244878c..f615736 100644
--- a/z-kernels/ipw2100/HISTORY
+++ b/z-kernels/ipw2100/HISTORY
@@ -1,3 +1,6 @@
+2007-02-16 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* CONFLICTS: removed ipw2100_driver, deprecation complete
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/z-kernels/ipw2200/CONFLICTS b/z-kernels/ipw2200/CONFLICTS
index bbbe6c8..e5d0036 100755
--- a/z-kernels/ipw2200/CONFLICTS
+++ b/z-kernels/ipw2200/CONFLICTS
@@ -1,2 +1 @@
-conflicts ipw2200_firmware y &&
-conflicts ipw2200_driver y  
+conflicts ipw2200_firmware y
diff --git a/z-kernels/ipw2200/HISTORY b/z-kernels/ipw2200/HISTORY
index d26d0e4..e2caa9a 100644
--- a/z-kernels/ipw2200/HISTORY
+++ b/z-kernels/ipw2200/HISTORY
@@ -1,3 +1,6 @@
+2007-02-16 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* CONFLICTS: removed ipw2200_driver, deprecation complete
+
 2007-02-05 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: Version 1.2.1.
 	* DEPENDS: Made ieee80211 optional.



More information about the SM-Commit mailing list