Context Navigation

Makefile.am

Timestamp:

Jan 11, 2015, 1:33:57 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20140904/ippconfig

Files:

Property svn:mergeinfo changed

/branches/eam_branches/ps2-tc3-20130727/ippconfig (added)	merged: 35862,36678,36680,37396-37397,37403
/tags/ipp-20141119/ippconfig (added)	merged: 37704
/trunk/ippconfig (added)	merged: 37375,37413-37415,37418,37420,37448,37465-37466,37470,37529,37552,37556,37560,37581,37588,37591,37615,37617,37619,37635,37638,37735,37751,37769,37772,37798

-              r35836
+              r37802
 install_files = \
         dvo.config \
         camera.config \
         format.config \
+        dvo.config        \
+        camera.config     \
+        format.config     \
         format_ps2.config \
+        ppImage.config
+        ppImage.config    \
+        ppMerge.config
 install_DATA = $(install_files)

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