<!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>[BuddyPress] [3296] branches/1.2: Bump version numbers in branch to 1.2.6.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>3296</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-10-20 20:14:42 +0000 (Wed, 20 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Bump version numbers in branch to 1.2.6.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bploaderphp">branches/1.2/bp-loader.php</a></li>
<li><a href="#branches12bpthemesbpdefaultstylecss">branches/1.2/bp-themes/bp-default/style.css</a></li>
<li><a href="#branches12readmetxt">branches/1.2/readme.txt</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bploaderphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-loader.php (3295 => 3296)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-loader.php        2010-10-13 13:14:00 UTC (rev 3295)
+++ branches/1.2/bp-loader.php        2010-10-20 20:14:42 UTC (rev 3296)
</span><span class="lines">@@ -4,13 +4,13 @@
</span><span class="cx"> Plugin URI: http://buddypress.org
</span><span class="cx"> Description: Social networking in a box. Build a social network for your company, school, sports team or niche community all based on the power and flexibility of WordPress.
</span><span class="cx"> Author: The BuddyPress Community
</span><del>-Version: 1.2.6-bleeding
</del><ins>+Version: 1.2.6
</ins><span class="cx"> Author URI: http://buddypress.org/community/members/
</span><span class="cx"> Site Wide Only: true
</span><span class="cx"> Network: true
</span><span class="cx"> */
</span><span class="cx"> 
</span><del>-define( 'BP_VERSION', '1.2.6-bleeding' );
</del><ins>+define( 'BP_VERSION', '1.2.6' );
</ins><span class="cx"> 
</span><span class="cx"> /***
</span><span class="cx">  * This file will load in each BuddyPress component based on which
</span></span></pre></div>
<a id="branches12bpthemesbpdefaultstylecss"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/style.css (3295 => 3296)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/style.css        2010-10-13 13:14:00 UTC (rev 3295)
+++ branches/1.2/bp-themes/bp-default/style.css        2010-10-20 20:14:42 UTC (rev 3296)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> Theme Name: BuddyPress Default
</span><span class="cx"> Theme URI: http://buddypress.org/extend/themes/
</span><span class="cx"> Description: The default theme for BuddyPress.
</span><del>-Version: 1.2.5.2
</del><ins>+Version: 1.2.6
</ins><span class="cx"> Author: BuddyPress.org
</span><span class="cx"> Author URI: http://buddypress.org
</span><span class="cx"> Tags: buddypress, two-columns, custom-header, white, blue
</span></span></pre></div>
<a id="branches12readmetxt"></a>
<div class="modfile"><h4>Modified: branches/1.2/readme.txt (3295 => 3296)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/readme.txt        2010-10-13 13:14:00 UTC (rev 3295)
+++ branches/1.2/readme.txt        2010-10-20 20:14:42 UTC (rev 3296)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> === Plugin Name ===
</span><del>-Contributors: apeatling, johnjamesjacoby, mrmaz
</del><ins>+Contributors: apeatling, johnjamesjacoby, mrmaz, djpaul, boonebgorges
</ins><span class="cx"> Tags: buddypress, social networking, activity, profiles, messaging, friends, groups, forums, microblogging, twitter, facebook, mingle, social, community, networks, networking, cms
</span><span class="cx"> Requires at least: 3.0
</span><span class="cx"> Tested up to: 3.0
</span><del>-Stable tag: 1.2.5.2
</del><ins>+Stable tag: 1.2.6
</ins><span class="cx"> 
</span><span class="cx"> == Description ==
</span><span class="cx"> 
</span><span class="lines">@@ -123,8 +123,8 @@
</span><span class="cx"> 
</span><span class="cx"> == Upgrade Notice ==
</span><span class="cx"> 
</span><del>-= 1.2.5.1 =
-Fixes 'Mark user as spam' and 'Delete user' issues. Important upgrade.
</del><ins>+= 1.2.6 =
+Fixes over 80 known issues. Important upgrade.
</ins><span class="cx"> 
</span><span class="cx"> == Changelog ==
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>