Browse Source

Spirit: merge from trunk

[SVN r68078]
Hartmut Kaiser 15 years ago
parent
commit
1f1a4178de
4 changed files with 5 additions and 5 deletions
  1. 2 2
      doc/Jamfile.v2
  2. 1 1
      libs/config
  3. 1 1
      libs/spirit
  4. 1 1
      libs/thread

+ 2 - 2
doc/Jamfile.v2

@@ -50,7 +50,7 @@ boostbook doc
     <dependency>../libs/thread/doc//thread
     <dependency>../libs/signals2/doc//hello_world_def_code_snippet.xml
     <dependency>../libs/random/doc//random
-    <dependency>../libs/spirit/doc//spirit
+    #<dependency>../libs/spirit/doc//spirit
 
     ## Add path references to the QuickBook generated docs...
 
@@ -74,7 +74,7 @@ boostbook doc
     <implicit-dependency>../libs/thread/doc//thread
     <implicit-dependency>../libs/signals2/doc//hello_world_def_code_snippet.xml
     <implicit-dependency>../libs/random/doc//random
-    <implicit-dependency>../libs/spirit/doc//spirit
+    #<implicit-dependency>../libs/spirit/doc//spirit
 
     <xsl:param>boost.libraries=../../libs/libraries.htm
 

+ 1 - 1
libs/config

@@ -1 +1 @@
-Subproject commit a29c3edc9bbf17de4f9ad92f90c1d2487f311f30
+Subproject commit 1614645b5cd519beecd961cc37154b67522a4d75

+ 1 - 1
libs/spirit

@@ -1 +1 @@
-Subproject commit 23d885ad701a239d84984e3390b9ae163517b5a0
+Subproject commit 397741e2326315daabdf0e192f749d09417cf472

+ 1 - 1
libs/thread

@@ -1 +1 @@
-Subproject commit 70584af9c085a1083595bfb96907074fb3111485
+Subproject commit 7c9116af2e032caa4f2f59128b1268c0e85e7f6d

粤ICP备19079148号