Changeset 42285
- Timestamp:
- Sep 7, 2022, 5:26:35 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 32 edited
- 1 copied
-
. (modified) (1 prop)
-
Ohana (modified) (1 prop)
-
Ohana/src/opihi (modified) (1 prop)
-
Ohana/src/relastro/src (modified) (1 prop)
-
Ohana/src/relphot (modified) (1 prop)
-
PS-IPP-Config (modified) (1 prop)
-
backups (modified) (1 prop)
-
extlibs (modified) (1 prop)
-
ippMonitor (modified) (1 prop)
-
ippScripts/scripts/rawcheck.pl (modified) (1 prop)
-
ippScripts/scripts/warp_overlap.pl (modified) (1 prop)
-
ippTests (modified) (1 prop)
-
ippTests/ippCheck (modified) (1 prop)
-
ippTools (modified) (1 prop)
-
ippTools/share (modified) (1 prop)
-
ippTools/src (modified) (1 prop)
-
ippconfig (modified) (1 prop)
-
ippconfig/gpc1/Makefile.am (modified) (1 diff)
-
ippconfig/gpc1/format_20220827.config (copied) (copied from tags/ipp-ops-20220705/ippconfig/gpc1/format_20220827.config )
-
ippconfig/gpc2/Makefile.am (modified) (1 prop)
-
ippconfig/gpc2/camera.config (modified) (1 prop)
-
ippconfig/gpc2/psastro.config (modified) (1 prop)
-
ppStack (modified) (1 prop)
-
ppTranslate/src/ppMops.h (modified) (1 prop)
-
ppTranslate/src/ppMopsDetections.c (modified) (1 prop)
-
ppTranslate/src/ppMopsRead.c (modified) (1 prop)
-
ppTranslate/src/ppMopsWrite.c (modified) (1 prop)
-
psModules (modified) (1 prop)
-
psastro (modified) (1 prop)
-
psconfig (modified) (1 prop)
-
psconfig/tagsets/ipp-3.1.dist (modified) (1 diff)
-
psphot (modified) (1 prop)
-
tools (modified) (1 prop)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/tags/ipp-ops-20220303-rc (added) merged: 42107,42111,42120-42121,42123 /tags/ipp-ops-20220705 (added) merged: 42234,42236-42237,42239-42240,42244-42252,42256,42263,42284
- Property svn:mergeinfo changed
-
trunk/Ohana
- Property svn:mergeinfo changed
/tags/ipp-ops-20220303-rc/Ohana (added) merged: 42123
- Property svn:mergeinfo changed
-
trunk/Ohana/src/opihi
- Property svn:mergeinfo deleted
-
trunk/Ohana/src/relastro/src
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/Ohana/src/relphot
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/PS-IPP-Config
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/backups
- Property svn:mergeinfo changed
/trunk/backups merged: 2-40968
- Property svn:mergeinfo changed
-
trunk/extlibs
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/ippMonitor
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/ippScripts/scripts/rawcheck.pl
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/ippScripts/scripts/warp_overlap.pl
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/ippTests
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/ippTests/ippCheck
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/ippTools
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/ippTools/share
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/ippTools/src
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/ippconfig
- Property svn:mergeinfo changed
/tags/ipp-ops-20220303-rc/ippconfig (added) merged: 42111 /tags/ipp-ops-20220705/ippconfig (added) merged: 42236-42237,42239-42240,42244-42246,42248-42251,42284
- Property svn:mergeinfo changed
-
trunk/ippconfig/gpc1/Makefile.am
r41750 r42285 16 16 format_20100228.config \ 17 17 format_20100723.config \ 18 format_20220827.config \ 18 19 format_mef.config \ 19 20 format_relphot.config \ -
trunk/ippconfig/gpc2/Makefile.am
- Property svn:mergeinfo set to (toggle deleted branches)
-
trunk/ippconfig/gpc2/camera.config
- Property svn:mergeinfo set to (toggle deleted branches)
-
trunk/ippconfig/gpc2/psastro.config
- Property svn:mergeinfo set to (toggle deleted branches)
-
trunk/ppStack
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/ppTranslate/src/ppMops.h
- Property svn:mergeinfo set to (toggle deleted branches)
-
trunk/ppTranslate/src/ppMopsDetections.c
- Property svn:mergeinfo set to (toggle deleted branches)
-
trunk/ppTranslate/src/ppMopsRead.c
- Property svn:mergeinfo set to (toggle deleted branches)
-
trunk/ppTranslate/src/ppMopsWrite.c
- Property svn:mergeinfo set to (toggle deleted branches)
-
trunk/psModules
- Property svn:mergeinfo changed
/tags/ipp-ops-20220705/psModules (added) merged: 42237
- Property svn:mergeinfo changed
-
trunk/psastro
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/psconfig
- Property svn:mergeinfo changed
/tags/ipp-ops-20220705/psconfig (added) merged: 42252
- Property svn:mergeinfo changed
-
trunk/psconfig/tagsets/ipp-3.1.dist
r42095 r42285 81 81 YYYYY extsrc/gpcsw ipp-2-9 -0 82 82 # YYYYY magic ipp-2-9 -0 83 #YYYYY magic/censorObjects ipp-2-9 -084 #YYYYY magic/remove ipp-2-9 -083 YYYYY magic/censorObjects ipp-2-9 -0 84 YYYYY magic/remove ipp-2-9 -0 85 85 YYYYY console ipp-2-9 -0 86 86 -
trunk/psphot
- Property svn:mergeinfo changed
/tags/ipp-ops-20220705/psphot (added) merged: 42256
- Property svn:mergeinfo changed
-
trunk/tools
- Property svn:mergeinfo changed (with no actual effect on merging)
Note:
See TracChangeset
for help on using the changeset viewer.
