[asterisk-scf-commits] asterisk-scf/integration/gitall.git branch "route_replica" created.

[Commits to the Asterisk SCF project code repositories]

branch "route_replica" has been created
        at  abdb6d350eefa3f45ba76ad80251d43008c49615 (commit)

- Log -----------------------------------------------------------------
commit abdb6d350eefa3f45ba76ad80251d43008c49615
Merge: 93729fb d3c7568
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu Mar 3 17:30:50 2011 -0600

    Merge branch 'master' of gitdepot:asterisk-scf/integration/gitall

diff --cc CMakeLists.txt
index bdacb27,550904d..25b237b
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -24,11 -34,9 +34,10 @@@ pjproject_build(pjsip
  pjproject_build(third_party)
  
  # Take care of slice definitions
- add_subdirectory(slice EXCLUDE_FROM_ALL)
- 
+ add_subdirectory(slice)
  add_subdirectory(logger)
  add_subdirectory(ice-util-cpp)
 +add_subdirectory(util-cpp)
  add_subdirectory(servicediscovery)
  add_subdirectory(test_channel)
  add_subdirectory(bridging)

commit 93729fbc74cf99e318b8a9939063eb2bce372450
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu Mar 3 17:30:07 2011 -0600

    Added cmake subdirectory for util-cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b2d5a8..bdacb27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,7 @@ add_subdirectory(slice EXCLUDE_FROM_ALL)
 
 add_subdirectory(logger)
 add_subdirectory(ice-util-cpp)
+add_subdirectory(util-cpp)
 add_subdirectory(servicediscovery)
 add_subdirectory(test_channel)
 add_subdirectory(bridging)

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/gitall.git