Changeset 37066 for branches/eam_branches/ipp-ops-20130712/ippToPsps/jython/Makefile.am

Timestamp:

Jul 17, 2014, 12:30:45 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) into trunk

Location:

branches/eam_branches/ipp-ops-20130712/ippToPsps

Files:

• . (modified) (1 prop)
• jython/Makefile.am (modified) (3 diffs)

branches/eam_branches/ipp-ops-20130712/ippToPsps/jython/Makefile.am

@@ -11 +11 @@
   datastoreRemover.py \
   detectionbatch.py \
+  diffbatch.py \
+  diffobjectbatch.py \
   dvodetections.py \
   dvoobjects.py \
@@ -16 +18 @@
   dxlayer.py \
   fits.py \
+  forcedobjectbatch.py \
+  forcedwarpbatch.py \
   gpc1db.py \
   initbatch.py \
+  insert.dvodb.info.py \        
   ipptopspsdb.py \
   ipptopsps.py \
@@ -30 +35 @@
   pslogger.py \
   queue.py \
+  removepending.py \ 
   scratchdb.py \
   setupScratchDb.py \