summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremiah Willcock <jewillco@osl.iu.edu>2010-07-03 18:37:39 +0000
committerJeremiah Willcock <jewillco@osl.iu.edu>2010-07-03 18:37:39 +0000
commit11d8780935ecb11c217e5e7e257ae2a8667e62de (patch)
tree640083ff14e848f708429a582f146e67128b40cb
parentf6829b9720f33f8e2c30dc2cb22208a6d92dfcef (diff)
downloadboost-11d8780935ecb11c217e5e7e257ae2a8667e62de.tar.gz
Merged r62693, r62932, r62933, r62998, r62999, r63000, r63002, r63048, r63049, r63084, r63189, r63190, r63227, r63234, r63241, r63244, r63268, r63269, r63329, r63332, r63333, r63334, r63335, r63405, r63466, r63472, r63511, r63530, r63535, r63536, r61796, and r61841 from trunk
[SVN r63554]
m---------libs/graph0
m---------libs/graph_parallel0
-rw-r--r--status/explicit-failures-markup.xml2
3 files changed, 1 insertions, 1 deletions
diff --git a/libs/graph b/libs/graph
-Subproject d6a48882b1a178137b1d98876b666f43ab94cc4
+Subproject 06f8e40a123c5988740972de7e5bebfd033945e
diff --git a/libs/graph_parallel b/libs/graph_parallel
-Subproject cf91109f684fd952dd1c923c6e445fb1d81eb4e
+Subproject 5d927f8bd0931444aa6dccc1866efc87a991cca
diff --git a/status/explicit-failures-markup.xml b/status/explicit-failures-markup.xml
index 7827d80036..30db64d8ce 100644
--- a/status/explicit-failures-markup.xml
+++ b/status/explicit-failures-markup.xml
@@ -1874,7 +1874,7 @@
<note author="Jim Douglas" date="18 Feb 06" refid="27"/>
</mark-expected-failures>
<mark-expected-failures>
- <test name="kolmogorov_max_flow_test"/>
+ <test name="boykov_kolmogorov_max_flow_test"/>
<test name="max_flow_test"/>
<toolset name="acc*"/>
<note author="Markus Schoepflin" refid="45"/>