" /> Status for Andrew DeFaria: February 22, 2004 - February 28, 2004 Archives

« February 15, 2004 - February 21, 2004 | Main | February 29, 2004 - March 6, 2004 »

February 27, 2004

Hok's merge

Assisting with Hok's merging of his FX -> 2.4 stuff.

Posted by at 11:34 PM |

February 24, 2004

Builds, Releases and Merging

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

  • Built and released 2.2.2.1
  • Completed merge of 2.2 -> 2.3
  • Built and released 2.3.0.5
  • Completed merge of 2.3 -> 2.4
  • Finished WebSAM Testing and entered bugs into Clearquest

Posted by at 3:54 PM |