summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Niebler <eric@boostpro.com>2011-09-23 15:04:13 +0000
committerEric Niebler <eric@boostpro.com>2011-09-23 15:04:13 +0000
commit0178f292cc75ea2722538a45a2ff4b1f9ce994ff (patch)
tree1354d563914cd380abe6dc9d87bad9bd11d94b66
parent96b5c520080d61b3ba795dd355fdd8fd6d5a6f3d (diff)
downloadboost-0178f292cc75ea2722538a45a2ff4b1f9ce994ff.tar.gz
merge [74470], [74481], [74513], [74527] from trunk; fixes #4723, #5905
[SVN r74534]
m---------libs/proto0
-rw-r--r--status/explicit-failures-markup.xml1
2 files changed, 1 insertions, 0 deletions
diff --git a/libs/proto b/libs/proto
-Subproject 71555e741316d97c513e8860e760b3cfa2a5268
+Subproject 80cbfcf32f463d4bafa6d070234fc8d544d2431
diff --git a/status/explicit-failures-markup.xml b/status/explicit-failures-markup.xml
index efb94b1d03..0b577a4754 100644
--- a/status/explicit-failures-markup.xml
+++ b/status/explicit-failures-markup.xml
@@ -2750,6 +2750,7 @@ for more information.
<toolset name="sun-5.10"/>
<toolset name="borland-*"/>
<toolset name="vacpp"/>
+ <toolset name="vacpp-*"/>
</mark-unusable>
</library>