https://wiki.networksecuritytoolkit.org/nstwiki/index.php?title=Merge_Changes_Back_To_Development_Area&feed=atom&action=historyMerge Changes Back To Development Area - Revision history2024-03-29T13:05:35ZRevision history for this page on the wikiMediaWiki 1.32.4https://wiki.networksecuritytoolkit.org/nstwiki/index.php?title=Merge_Changes_Back_To_Development_Area&diff=7569&oldid=prevPaul Blankenbaker at 22:44, 20 February 20142014-02-20T22:44:14Z<p></p>
<table class="diff diff-contentalign-left" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #222; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #222; text-align: center;">Revision as of 22:44, 20 February 2014</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>
<td colspan="2" class="diff-lineno">Line 1:</td></tr>
<tr><td class='diff-marker'>−</td><td style="color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>At this point, all of the source code changes related to the release should have been committed to the ''<del class="diffchange diffchange-inline">trunk</del>''. In order to continue development, you will want to merge these changes back into the ''dev'' area using the instructions found on the [[Subversion Notes]] page.</div></td><td class='diff-marker'>+</td><td style="color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>At this point, all of the source code changes related to the release should have been committed to the ''<ins class="diffchange diffchange-inline">repo</ins>'' <ins class="diffchange diffchange-inline">area</ins>. In order to continue development, you will want to merge these changes back into <ins class="diffchange diffchange-inline">the appropriate directory under </ins>the ''dev'' area using the instructions found on the [[Subversion Notes]] page.</div></td></tr>
</table>Paul Blankenbakerhttps://wiki.networksecuritytoolkit.org/nstwiki/index.php?title=Merge_Changes_Back_To_Development_Area&diff=6202&oldid=prevPaul Blankenbaker: Created page with "At this point, all of the source code changes related to the release should have been committed to the ''trunk''. In order to continue development, you will want to merge these c..."2012-09-03T16:09:41Z<p>Created page with "At this point, all of the source code changes related to the release should have been committed to the ''trunk''. In order to continue development, you will want to merge these c..."</p>
<p><b>New page</b></p><div>At this point, all of the source code changes related to the release should have been committed to the ''trunk''. In order to continue development, you will want to merge these changes back into the ''dev'' area using the instructions found on the [[Subversion Notes]] page.</div>Paul Blankenbaker