2 <html lang="en-us" itemscope itemtype="http://schema.org/Article">
5 <meta name="description" content="Lots of merging and building with 2 releases today. Still working through problems with us_2340 china_2340 merging. Had to merge flmFiles.h from 2.3 -> us_2340 to pick up some definintions. Also had to build mksf.exe because some changes were coming...">
6 <meta name="generator" content="Movable Type 5.2.3">
7 <title>Builds, Releases and Merging - Status</title>
8 <link rel="alternate" type="application/atom+xml" title="Recent Entries" href="http://defaria.com/blogs/Status/atom.xml">
9 <link rel="canonical" href="http://defaria.com/blogs/Status/2004/02/builds-releases.html">
10 <meta name="viewport" content="width=device-width,initial-scale=1">
11 <link rel="stylesheet" href="http://defaria.com/blogs/Status/styles.css">
13 <link rel="stylesheet" href="http://defaria.com/blogs/Status/styles_ie.css">
14 <script src="/mt/mt-static/support/theme_static/rainier/js/html5shiv.js"></script>
17 <link rel="start" href="http://defaria.com/blogs/Status/">
19 <link rel="prev" href="http://defaria.com/blogs/Status/2004/02/build-view-bug.html" title="build_view bug">
20 <link rel="next" href="http://defaria.com/blogs/Status/2004/02/hoks-merge.html" title="Hok's merge">
21 <!-- Open Graph Protocol -->
22 <meta property="og:type" content="article">
23 <meta property="og:locale" content="en-us">
24 <meta property="og:title" content="Builds, Releases and Merging">
25 <meta property="og:url" content="http://defaria.com/blogs/Status/2004/02/builds-releases.html">
26 <meta property="og:description" content="Lots of merging and building with 2 releases today. Still working through problems with us_2340 china_2340 merging. Had to merge flmFiles.h from 2.3 -> us_2340 to pick up some definintions. Also had to build mksf.exe because some changes were coming...">
27 <meta property="og:site_name" content="Status">
28 <meta property="og:image" content="/mt/mt-static/support/theme_static/rainier/img/siteicon-sample.png">
30 <meta itemprop="description" content="Lots of merging and building with 2 releases today. Still working through problems with us_2340 china_2340 merging. Had to merge flmFiles.h from 2.3 -> us_2340 to pick up some definintions. Also had to build mksf.exe because some changes were coming...">
31 <link itemprop="url" href="http://defaria.com/blogs/Status/2004/02/builds-releases.html">
32 <link itemprop="image" href="/mt/mt-static/support/theme_static/rainier/img/siteicon-sample.png">
37 <div id="container-inner">
38 <header id="header" role="banner">
39 <div id="header-inner">
40 <div id="header-content">
42 <a href="http://defaria.com/blogs/Status/">
51 <nav role="navigation">
53 <li><a href="http://defaria.com/blogs/Status/">Home</a></li>
62 <div id="content-inner">
63 <ul class="breadcrumb breadcrumb-list">
64 <li class="breadcrumb-list-item"><a href="http://defaria.com/blogs/Status/">Home</a></li>
65 <li class="breadcrumb-list-item">Builds, Releases and Merging</li>
67 <div id="individual-main" class="main" role="main">
68 <article id="entry-1425" class="entry entry-asset asset hentry">
69 <div class="asset-header">
70 <h2 itemprop="name" class="asset-name entry-title">Builds, Releases and Merging</h2>
71 <footer class="asset-meta">
72 <ul class="asset-meta-list">
73 <li class="asset-meta-list-item">Posted on <time datetime="2004-02-24T15:54:29-08:00" itemprop="datePublished">February 24, 2004</time></li>
74 <li class="asset-meta-list-item">by <span class="author entry-author vcard"></span></li>
77 <li class="asset-meta-list-item">in <a itemprop="articleSection" rel="tag" href="http://defaria.com/blogs/Status/salira/">Salira</a></li>
83 <div class="entry-content asset-content" itemprop="articleBody">
84 <p>Lots of merging and building with 2 releases today. Still working through problems with us_2340 <-> china_2340 merging. Had to merge flmFiles.h from 2.3 -> us_2340 to pick up some definintions. Also had to build mksf.exe because some changes were coming from China and some from here at the same time. Merging the .exe is not possible in such situations so after insuring that all sources were merged I rebuilt the .exe</p>
88 <li>Built and released 2.2.2.1</li>
90 <li>Completed merge of 2.2 -> 2.3</li>
92 <li>Built and released 2.3.0.5</li>
94 <li>Completed merge of 2.3 -> 2.4</li>
96 <li>Finished <a href="http://sonsweb.salira.com/WebSAM.html">WebSAM Testing</a> and entered <a href="http://sonsweb.salira.com/WebSAM_Testing.html">bugs</a> into Clearquest</li>
101 <nav class="page-navigation entry-navigation pagination content-nav">
102 <ul class="page-navigation-list">
104 <li class="page-navigation-list-item page-navigation-prev"><a rel="prev" href="http://defaria.com/blogs/Status/2004/02/build-view-bug.html" title="build_view bug">Previous entry</a></li>
107 <li class="page-navigation-list-item page-navigation-next"><a rel="next" href="http://defaria.com/blogs/Status/2004/02/hoks-merge.html" title="Hok's merge">Next entry</a></li>
112 <aside id="zenback" class="zenback feedback">
113 Please paste Zenback script code here.
120 <aside class="widgets related" role="complementary">
121 <nav class="widget-search widget">
122 <div class="widget-content">
123 <form method="get" id="search" action="http://defaria.com/mt/mt-search.cgi">
125 <input type="text" name="search" value="" placeholder="Search...">
127 <input type="hidden" name="IncludeBlogs" value="8">
129 <input type="hidden" name="limit" value="20">
130 <button type="submit" name="button">
131 <img alt="Search" src="/mt/mt-static/support/theme_static/rainier/img/search-icon.png">
137 <nav class="widget-archive-category widget">
138 <h3 class="widget-header">Categories</h3>
139 <div class="widget-content">
142 <ul class="widget-list">
145 <li class="widget-list-item"><a href="http://defaria.com/blogs/Status/ameriquest/">Ameriquest (99)</a>
153 <li class="widget-list-item"><a href="http://defaria.com/blogs/Status/audience/">Audience (3)</a>
161 <li class="widget-list-item"><a href="http://defaria.com/blogs/Status/broadcom/">Broadcom (76)</a>
169 <li class="widget-list-item"><a href="http://defaria.com/blogs/Status/gpdb/">GPDB (35)</a>
177 <li class="widget-list-item"><a href="http://defaria.com/blogs/Status/general-dynamics/">General Dynamics (61)</a>
185 <li class="widget-list-item"><a href="http://defaria.com/blogs/Status/general-electric/">General Electric (13)</a>
193 <li class="widget-list-item"><a href="http://defaria.com/blogs/Status/hewlett-packard/">Hewlett Packard (13)</a>
201 <li class="widget-list-item"><a href="http://defaria.com/blogs/Status/lynuxworks/">LynuxWorks (162)</a>
209 <li class="widget-list-item"><a href="http://defaria.com/blogs/Status/pqa/">PQA (35)</a>
217 <li class="widget-list-item"><a href="http://defaria.com/blogs/Status/salira/">Salira (79)</a>
225 <li class="widget-list-item"><a href="http://defaria.com/blogs/Status/tellabs/">Tellabs (2)</a>
233 <li class="widget-list-item"><a href="http://defaria.com/blogs/Status/texas-instruments/">Texas Instruments (31)</a>
245 <nav class="widget-archive-dropdown widget">
246 <h3 class="widget-header">Archives</h3>
247 <div class="widget-content">
249 <option>Select a Month...</option>
251 <option value="http://defaria.com/blogs/Status/2016/02/">February 2016</option>
255 <option value="http://defaria.com/blogs/Status/2014/09/">September 2014</option>
259 <option value="http://defaria.com/blogs/Status/2014/04/">April 2014</option>
263 <option value="http://defaria.com/blogs/Status/2014/03/">March 2014</option>
267 <option value="http://defaria.com/blogs/Status/2013/02/">February 2013</option>
271 <option value="http://defaria.com/blogs/Status/2012/09/">September 2012</option>
275 <option value="http://defaria.com/blogs/Status/2012/08/">August 2012</option>
279 <option value="http://defaria.com/blogs/Status/2012/05/">May 2012</option>
283 <option value="http://defaria.com/blogs/Status/2012/04/">April 2012</option>
287 <option value="http://defaria.com/blogs/Status/2012/02/">February 2012</option>
291 <option value="http://defaria.com/blogs/Status/2012/01/">January 2012</option>
295 <option value="http://defaria.com/blogs/Status/2011/10/">October 2011</option>
299 <option value="http://defaria.com/blogs/Status/2011/07/">July 2011</option>
303 <option value="http://defaria.com/blogs/Status/2010/09/">September 2010</option>
307 <option value="http://defaria.com/blogs/Status/2010/08/">August 2010</option>
311 <option value="http://defaria.com/blogs/Status/2010/04/">April 2010</option>
315 <option value="http://defaria.com/blogs/Status/2010/03/">March 2010</option>
319 <option value="http://defaria.com/blogs/Status/2010/02/">February 2010</option>
323 <option value="http://defaria.com/blogs/Status/2009/05/">May 2009</option>
327 <option value="http://defaria.com/blogs/Status/2009/04/">April 2009</option>
331 <option value="http://defaria.com/blogs/Status/2008/07/">July 2008</option>
335 <option value="http://defaria.com/blogs/Status/2008/05/">May 2008</option>
339 <option value="http://defaria.com/blogs/Status/2008/04/">April 2008</option>
343 <option value="http://defaria.com/blogs/Status/2008/03/">March 2008</option>
347 <option value="http://defaria.com/blogs/Status/2008/02/">February 2008</option>
351 <option value="http://defaria.com/blogs/Status/2008/01/">January 2008</option>
355 <option value="http://defaria.com/blogs/Status/2007/12/">December 2007</option>
359 <option value="http://defaria.com/blogs/Status/2007/11/">November 2007</option>
363 <option value="http://defaria.com/blogs/Status/2007/10/">October 2007</option>
367 <option value="http://defaria.com/blogs/Status/2007/09/">September 2007</option>
371 <option value="http://defaria.com/blogs/Status/2007/08/">August 2007</option>
375 <option value="http://defaria.com/blogs/Status/2007/07/">July 2007</option>
379 <option value="http://defaria.com/blogs/Status/2007/06/">June 2007</option>
383 <option value="http://defaria.com/blogs/Status/2007/05/">May 2007</option>
387 <option value="http://defaria.com/blogs/Status/2007/04/">April 2007</option>
391 <option value="http://defaria.com/blogs/Status/2007/03/">March 2007</option>
395 <option value="http://defaria.com/blogs/Status/2007/01/">January 2007</option>
399 <option value="http://defaria.com/blogs/Status/2006/12/">December 2006</option>
403 <option value="http://defaria.com/blogs/Status/2006/11/">November 2006</option>
407 <option value="http://defaria.com/blogs/Status/2006/10/">October 2006</option>
411 <option value="http://defaria.com/blogs/Status/2006/09/">September 2006</option>
415 <option value="http://defaria.com/blogs/Status/2006/07/">July 2006</option>
419 <option value="http://defaria.com/blogs/Status/2006/06/">June 2006</option>
423 <option value="http://defaria.com/blogs/Status/2006/05/">May 2006</option>
427 <option value="http://defaria.com/blogs/Status/2006/04/">April 2006</option>
431 <option value="http://defaria.com/blogs/Status/2006/03/">March 2006</option>
435 <option value="http://defaria.com/blogs/Status/2006/02/">February 2006</option>
439 <option value="http://defaria.com/blogs/Status/2006/01/">January 2006</option>
443 <option value="http://defaria.com/blogs/Status/2005/12/">December 2005</option>
447 <option value="http://defaria.com/blogs/Status/2005/11/">November 2005</option>
451 <option value="http://defaria.com/blogs/Status/2005/10/">October 2005</option>
455 <option value="http://defaria.com/blogs/Status/2005/09/">September 2005</option>
459 <option value="http://defaria.com/blogs/Status/2005/08/">August 2005</option>
463 <option value="http://defaria.com/blogs/Status/2005/07/">July 2005</option>
467 <option value="http://defaria.com/blogs/Status/2005/06/">June 2005</option>
471 <option value="http://defaria.com/blogs/Status/2005/05/">May 2005</option>
475 <option value="http://defaria.com/blogs/Status/2005/04/">April 2005</option>
479 <option value="http://defaria.com/blogs/Status/2005/03/">March 2005</option>
483 <option value="http://defaria.com/blogs/Status/2005/02/">February 2005</option>
487 <option value="http://defaria.com/blogs/Status/2005/01/">January 2005</option>
491 <option value="http://defaria.com/blogs/Status/2004/12/">December 2004</option>
495 <option value="http://defaria.com/blogs/Status/2004/09/">September 2004</option>
499 <option value="http://defaria.com/blogs/Status/2004/08/">August 2004</option>
503 <option value="http://defaria.com/blogs/Status/2004/07/">July 2004</option>
507 <option value="http://defaria.com/blogs/Status/2004/06/">June 2004</option>
511 <option value="http://defaria.com/blogs/Status/2004/05/">May 2004</option>
515 <option value="http://defaria.com/blogs/Status/2004/04/">April 2004</option>
519 <option value="http://defaria.com/blogs/Status/2004/03/">March 2004</option>
523 <option value="http://defaria.com/blogs/Status/2004/02/">February 2004</option>
527 <option value="http://defaria.com/blogs/Status/2004/01/">January 2004</option>
531 <option value="http://defaria.com/blogs/Status/2003/12/">December 2003</option>
535 <option value="http://defaria.com/blogs/Status/2003/11/">November 2003</option>
543 <div class="widget-syndication widget section">
544 <div class="widget-content">
545 <p><img src="http://defaria.com/mt/mt-static/images/status_icons/feed.gif" alt="Subscribe to feed" width="9" height="9" /> <a href="http://defaria.com/blogs/Status/atom.xml">Subscribe to this blog's feed</a></p>
553 <footer id="footer" role="contentinfo">
554 <div id="footer-inner">
555 <div id="footer-content">
556 <nav role="navigation">
558 <li><a href="http://defaria.com/blogs/Status/">Home</a></li>
564 <p class="license">© Copyright 2016.</p>
565 <p class="poweredby">Powered by <a href="http://www.movabletype.org/">Movable Type</a></p>
571 <script src="http://defaria.com/mt/mt-static/jquery/jquery.min.js"></script>
572 <script src="http://defaria.com/blogs/Status/mt-theme-scale2.js"></script>