diff options
author | Hartmut Kaiser <hartmut.kaiser@gmail.com> | 2011-01-11 23:19:22 +0000 |
---|---|---|
committer | Hartmut Kaiser <hartmut.kaiser@gmail.com> | 2011-01-11 23:19:22 +0000 |
commit | a4b82f518c06fbad949c36dc119fd2d4923df1d6 (patch) | |
tree | da30030ee7b0cf7dfc797e0ea09742c7ddfd228a | |
parent | 5e21528be8b662ac6d857898dc90ce38df5b9191 (diff) | |
download | boost-a4b82f518c06fbad949c36dc119fd2d4923df1d6.tar.gz |
Wave: merging from trunk
[SVN r68004]
-rw-r--r-- | doc/Jamfile.v2 | 2 | ||||
m--------- | libs/config | 0 | ||||
m--------- | libs/serialization | 0 | ||||
m--------- | libs/wave | 0 | ||||
m--------- | tools/build | 0 |
5 files changed, 2 insertions, 0 deletions
diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index ece6e8b5ff..bc6cbad190 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -50,6 +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 ## Add path references to the QuickBook generated docs... @@ -73,6 +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 <xsl:param>boost.libraries=../../libs/libraries.htm diff --git a/libs/config b/libs/config -Subproject 3ce24d63892de35364d4e13840feaf252ec0327 +Subproject a29c3edc9bbf17de4f9ad92f90c1d2487f311f3 diff --git a/libs/serialization b/libs/serialization -Subproject 0f48842fa6ad4f364cd8b8ac6264d5cf13fcbcc +Subproject efa33adb99ea791f8ff97550822a6955bd5776c diff --git a/libs/wave b/libs/wave -Subproject 74d7bcdb3c2d6b55732a421d741d1a28bb85d72 +Subproject 6521b47fc743f533e2b5b522fb99e89b61f4ef9 diff --git a/tools/build b/tools/build -Subproject de00e5dafda24fad2f2db05ac337d7cdd9098fc +Subproject 1a3f8a9cfd81db2b394a8c8f76aa36f1cfa9371 |