[hydra-commits] hydra/media_format_ulaw.git branch "master" updated.

[Commits to the Hydra project code repositories]

branch "master" has been updated
       via  56bf70efb2f481f9d4ead37bd0305128901b4786 (commit)
      from  031dc0950c762727d02bf9f5b42604dcebe24f52 (commit)

Summary of changes:
 slice                        |    2 +-
 src/MediaFormatULAW.cpp      |    2 +-
 test/TestMediaFormatULAW.cpp |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 56bf70efb2f481f9d4ead37bd0305128901b4786
Author: Joshua Colp <jcolp at digium.com>
Date:   Fri Aug 6 13:18:48 2010 -0300

    Update to new location of service locator slice.

diff --git a/slice b/slice
index 4bcec48..5caa209 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit 4bcec48e26831c99d66af8c46c6ed68b2dcd0687
+Subproject commit 5caa209193d349a49ebb6035201e093b68eba945
diff --git a/src/MediaFormatULAW.cpp b/src/MediaFormatULAW.cpp
index 630f8f2..24a628f 100644
--- a/src/MediaFormatULAW.cpp
+++ b/src/MediaFormatULAW.cpp
@@ -18,7 +18,7 @@
 
 #include <Ice/Ice.h>
 
-#include "Core/ServiceLocatorI.h"
+#include "Core/Discovery/ServiceLocatorI.h"
 #include "Media/MediaI.h"
 
 using namespace std;
diff --git a/test/TestMediaFormatULAW.cpp b/test/TestMediaFormatULAW.cpp
index aea08b1..a853c49 100644
--- a/test/TestMediaFormatULAW.cpp
+++ b/test/TestMediaFormatULAW.cpp
@@ -7,7 +7,7 @@
 
 #include <Ice/Ice.h>
 
-#include "Core/ServiceLocatorI.h"
+#include "Core/Discovery/ServiceLocatorI.h"
 #include "Media/MediaI.h"
 
 using namespace std;

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


-- 
hydra/media_format_ulaw.git