Changeset 35110 for trunk

Timestamp:

Feb 6, 2013, 3:31:45 PM (13 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20121219

Location:

trunk

Files:

• . (modified) (1 prop)
• Nebulous (modified) (1 prop)
• Nebulous-Server (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/Makefile.in (modified) (1 diff)
• Ohana/src/libohana/src (modified) (1 prop)
• ippMonitor (modified) (1 prop)
• ippScripts/scripts/destreak_restore_camera.pl (modified) (1 prop)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippScripts/scripts/magic_destreak.pl (modified) (1 prop)
• ippTasks (modified) (1 prop)
• ippTasks/Makefile.am (modified) (1 diff)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 prop)
• ippTools/share/warptool_towarped.sql (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/magictool.c (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/recipes/ppSub.config (modified) (1 prop)
• ippconfig/recipes/psphot.config (modified) (1 prop)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 prop)
• ppImage/src (modified) (1 prop)
• psModules (modified) (1 prop)
• psconfig (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotStackImageLoop.c (modified) (1 prop)
• pstamp/scripts (modified) (1 prop)
• psvideophot (modified) (1 prop)

trunk/Ohana/Makefile.in

@@ -32 +32 @@
 dvosplit    \
 dvomerge    \
+dvopsps     \
 elixir      \
 gastro      \

trunk/ippTasks/Makefile.am

@@ -72 +72 @@
 
 install-data-hook:
-        chmod 0755 $(panstasks) $(ipptasksdir)
+        chmod 0755 $(panstasksdir) $(ipptasksdir)
 
 EXTRA_DIST = $(task_files) $(other_files)