# HG changeset patch # User Nina Engelhardt # Date 1337941383 -7200 # Node ID 5e315ce69d8221e6e76e93614357357b4b937087 # Parent 227cd4d33d9423cf38320fec90b87f3ed4af5d90 test diff -r 227cd4d33d94 -r 5e315ce69d82 __brch__Common_ancestor --- a/__brch__Common_ancestor Thu May 17 20:39:44 2012 +0200 +++ b/__brch__Common_ancestor Fri May 25 12:23:03 2012 +0200 @@ -6,6 +6,7 @@ Note, if this branch is used, then NUM_CORES in VMS_HW_specific_defs.h file has to be updated with the number of cores in your machine + ======== Background on branch naming ========= There are two kinds of branchs: ones used to develop features, and ones tuned to particular hardware. A given HW branch may combine features from several feature-branches, picking and choosing among them.