Changeset 29517

Timestamp:

Oct 21, 2010, 2:47:23 PM (16 years ago)

Author:

eugene

Message:

merge from trunk

Location:

branches/eam_branches/ipp-20100823/psModules/src

Files:

• extras/Makefile.am (modified) (2 diffs)
• extras/pmCensor.c (copied) (copied from trunk/psModules/src/extras/pmCensor.c )
• extras/pmCensor.h (copied) (copied from trunk/psModules/src/extras/pmCensor.h )
• psmodules.h (modified) (1 diff)

branches/eam_branches/ipp-20100823/psModules/src/extras/Makefile.am

@@ -10 +10 @@
         pmVisual.c \
         pmVisualUtils.c \
-        ippStages.c
+        ippStages.c \
+        pmCensor.c
 
 pkginclude_HEADERS = \
@@ -20 +21 @@
         pmVisualUtils.h \
         ippDiffMode.h \
-        ippStages.h
+        ippStages.h \
+        pmCensor.h
 
 CLEANFILES = *~

branches/eam_branches/ipp-20100823/psModules/src/psmodules.h

@@ -13 +13 @@
 #include <ippStages.h>
 #include <ippDiffMode.h>
+#include <pmCensor.h>
 
 // XXX the following headers define constructs needed by the elements below