<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[17388] branches/3.0: GPLv2+ for 3.0 branch</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17388">17388</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2011-02-03 23:13:21 +0000 (Thu, 03 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>GPLv2+ for 3.0 branch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches30readmehtml">branches/3.0/readme.html</a></li>
<li><a href="#branches30wpincludesversionphp">branches/3.0/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches30readmehtml"></a>
<div class="modfile"><h4>Modified: branches/3.0/readme.html (17387 => 17388)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/readme.html 2011-02-03 20:42:18 UTC (rev 17387)
+++ branches/3.0/readme.html 2011-02-03 23:13:21 UTC (rev 17388)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> <p>WordPress is the official continuation of <a href="http://cafelog.com/">b2/caf&#233;log</a>, which came from Michel V. The work has been continued by the <a href="http://wordpress.org/about/">WordPress developers</a>. If you would like to support WordPress, please consider <a href="http://wordpress.org/donate/" title="Donate to WordPress">donating</a>.</p>
</span><span class="cx">
</span><span class="cx"> <h1>Copyright</h1>
</span><del>-<p>WordPress is released under the <abbr title="GNU Public License">GPL</abbr> (see <a href="license.txt">license.txt</a>).</p>
</del><ins>+<p>WordPress is free software, and is released under the terms of the <abbr title="GNU Public License">GPL</abbr> version 2 or (at your option) any later version. See <a href="license.txt">license.txt</a>.</p>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="branches30wpincludesversionphp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-includes/version.php (17387 => 17388)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-includes/version.php 2011-02-03 20:42:18 UTC (rev 17387)
+++ branches/3.0/wp-includes/version.php 2011-02-03 23:13:21 UTC (rev 17388)
</span><span class="lines">@@ -1,8 +1,22 @@
</span><span class="cx"> <?php
</span><del>-/**
- * This holds the version number in a separate file so we can bump it without cluttering the SVN
- */
</del><ins>+/*
+WordPress - Web publishing software
</ins><span class="cx">
</span><ins>+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
</ins><span class="cx"> /**
</span><span class="cx"> * The WordPress version string
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>