CVSROOT: /web/www
Module name: www
Changes by: Mahyar Moghimi <moonfriend> 11/01/01 10:23:40
Modified files:
distros : common-distros.html
Log message:
updating thangnus and correcting the previous mistake on common-distros
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.html?cvsroot=www&r1=1.16&r2=1.17
Patches:
Index: common-distros.html
===================================================================
RCS file: /web/www/www/distros/common-distros.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- common-distros.html 1 Jan 2011 09:57:56 -0000 1.16
+++ common-distros.html 1 Jan 2011 10:23:37 -0000 1.17
@@ -131,15 +131,9 @@
<p>We're not aware of problems in Slackware aside from the two listed
above: there's no clear policy about what software can be included,
-<<<<<<< common-distros.html
-and nonfree blobs are shipped with Linux. It ships with the non-free
image-viewing
-program xv. Of course, with no firm policy in place, there might be other
nonfree software included that
-we missed.</p>
-=======
and nonfree blobs are shipped with Linux. It also ships with the non-free
image-viewing program xv. Of course, with no firm policy in place, there
might be other nonfree software included that we missed.</p>
->>>>>>> 1.15
<a id="SUSE"></a>
<h3>SUSE</h3>
@@ -198,7 +192,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2011/01/01 09:57:56 $
+$Date: 2011/01/01 10:23:37 $
<!-- timestamp end -->
</p>
</div>
