Context Navigation

Makefile.am

Timestamp:

Feb 17, 2011, 3:24:10 PM (15 years ago)

Author:

eugene

Message:

merge changes from the trunk

Location:

branches/eam_branches/ipp-20110213/ppImage/src

Files:

Property svn:mergeinfo set to

/branches/czw_branch/20101203/ppImage/src	merged	eligible
/branches/eam_branches/ipp-20101103/ppImage/src	merged	eligible
/branches/eam_branches/ipp-20101205/ppImage/src	merged	eligible
/tags/ipp-20101215/ppImage/src	merged	eligible
/trunk/ppImage/src	merged	eligible

-              r28043
+              r30680
 noinst_HEADERS = \
         ppImage.h
+        ppImage.h
 if HAVE_SVNVERSION
 …
         ppImageFileCheck.c \
         ppImageVersion.c \
+        ppImageMemory.c
+        ppImageMemory.c \
+        ppImageAddNoise.c \
+        ppImageRandomGaussian.c
 CLEANFILES = *~

Note: See TracChangeset for help on using the changeset viewer.