# HG changeset patch
# User Sean Halle <seanhalle@yahoo.com>
# Date 1346668136 25200
# Node ID 5c9b9967b423605d1b9fcca70fb629540c2fc68e
# Parent  88f71110f1a9a095fce55b6fcda73c86c9fbfcef
new branch -- Dev_ML -- for making VMS take langlets whose constructs can be mixed

diff -r 88f71110f1a9 -r 5c9b9967b423 __brch__Common_ancestor
--- a/__brch__Common_ancestor	Sat Aug 25 12:22:21 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-A HW branch for:
-
-generic MultiCore machines with x86 64bit instruction set
-
-This branch shouldn't be used, except as a lazy fall-back.  Instead, try out other branches tuned to specific hardware platforms to find the one that performs best on your machine.  Use the "exe_time_vs_task_size" project to generate curves of overhead, and compare result from various branches.
-
-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.
-
-After Feb 2012, branches are named by the scheme:
-
-feat__<feat_descr>__<HW_feat_dev_on>
-
-HW__<desc_of_HW_brch_tuned_for>
-
-where <HW_feat_dev_on> and <desc_of_HW_brch_tuned_for> follow the pattern:
-
-<num_socket> x <num_cores>_<Manuf>_<special_features>
-
-Examples:
-
-feat__exp_array_malloc
-
-feat__rand_backoff__4x10_Intel_WestmereEx
-
-HW__1x4_Intel_SandyBridge
-
-HW__4x10_Intel_WestmereEx
-
-HW__1x4_AMD_mobile
diff -r 88f71110f1a9 -r 5c9b9967b423 __brch__Dev_ML
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/__brch__Dev_ML	Mon Sep 03 03:28:56 2012 -0700
@@ -0,0 +1,34 @@
+A HW branch for:
+
+generic MultiCore machines with x86 64bit instruction set
+
+This branch shouldn't be used, except as a lazy fall-back.  Instead, try out other branches tuned to specific hardware platforms to find the one that performs best on your machine.  Use the "exe_time_vs_task_size" project to generate curves of overhead, and compare result from various branches.
+
+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.
+
+After Feb 2012, branches are named by the scheme:
+
+feat__<feat_descr>__<HW_feat_dev_on>
+
+HW__<desc_of_HW_brch_tuned_for>
+
+where <HW_feat_dev_on> and <desc_of_HW_brch_tuned_for> follow the pattern:
+
+<num_socket> x <num_cores>_<Manuf>_<special_features>
+
+Examples:
+
+feat__exp_array_malloc
+
+feat__rand_backoff__4x10_Intel_WestmereEx
+
+HW__1x4_Intel_SandyBridge
+
+HW__4x10_Intel_WestmereEx
+
+HW__1x4_AMD_mobile