CVSROOT: /web/www
Module name: www
Changes by: Mahyar Moghimi <moonfriend> 11/01/01 09:58:08
Modified files:
distros : common-distros.html
thankgnus : 2011supporters.html
Log message:
added thankgnu for Bruce Baumgart
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/thankgnus/2011supporters.html?cvsroot=www&r1=1.1&r2=1.2
Patches:
Index: distros/common-distros.html
===================================================================
RCS file: /web/www/www/distros/common-distros.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- distros/common-distros.html 13 Dec 2010 06:34:14 -0000 1.15
+++ distros/common-distros.html 1 Jan 2011 09:57:56 -0000 1.16
@@ -131,9 +131,15 @@
<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>
@@ -192,7 +198,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2010/12/13 06:34:14 $
+$Date: 2011/01/01 09:57:56 $
<!-- timestamp end -->
</p>
</div>
Index: thankgnus/2011supporters.html
===================================================================
RCS file: /web/www/www/thankgnus/2011supporters.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- thankgnus/2011supporters.html 20 Dec 2010 02:41:55 -0000 1.1
+++ thankgnus/2011supporters.html 1 Jan 2011 09:58:02 -0000 1.2
@@ -74,6 +74,8 @@
<ul>
<!-- Let's keep all lists in alphabetical order. Thanks. -->
+ <li>Bruce Baumgart</li>
+
</ul>
@@ -110,7 +112,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2010/12/20 02:41:55 $
+$Date: 2011/01/01 09:58:02 $
<!-- timestamp end -->
</p>
</div>
