IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jan 12, 2015, 12:36:24 PM (12 years ago)
Author:
eugene
Message:

merge changes from trunk

Location:
branches/eam_branches/ipp-pv3-20140717-merge/psModules/src/objects
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-pv3-20140717-merge/psModules/src/objects

    • Property svn:ignore

      •  

        old new  
        1616pmSourceIO_CMF_PS1_SV2.c
        1717pmSourceIO_CMF_PS1_SV3.c
         18pmSourceIO_CMF_PS1_SV4.c
        1819pmSourceIO_CMF_PS1_DV1.c
        1920pmSourceIO_CMF_PS1_DV2.c
        2021pmSourceIO_CMF_PS1_DV3.c
        2122pmSourceIO_CMF_PS1_DV4.c
         23

  • branches/eam_branches/ipp-pv3-20140717-merge/psModules/src/objects/Makefile.am

    r36890 r37828  
    5353        pmSourceIO_CMF_PS1_SV2.c \
    5454        pmSourceIO_CMF_PS1_SV3.c \
     55        pmSourceIO_CMF_PS1_SV4.c \
    5556        pmSourceIO_CMF_PS1_DV1.c \
    5657        pmSourceIO_CMF_PS1_DV2.c \
    … …  
    157158pmSourceIO_CMF_PS1_SV1.c \
    158159pmSourceIO_CMF_PS1_SV2.c \
    159 pmSourceIO_CMF_PS1_SV3.c
     160pmSourceIO_CMF_PS1_SV3.c \
     161pmSourceIO_CMF_PS1_SV4.c
    160162
    161163pmSourceIO_CMF_PS1_V1.c : pmSourceIO_CMF.c.in mksource.pl
    … …  
    195197        mksource.pl pmSourceIO_CMF.c.in PS1_SV3 pmSourceIO_CMF_PS1_SV3.c
    196198
     199pmSourceIO_CMF_PS1_SV4.c : pmSourceIO_CMF.c.in mksource.pl
     200        mksource.pl pmSourceIO_CMF.c.in PS1_SV4 pmSourceIO_CMF_PS1_SV4.c
     201
    197202# EXTRA_DIST = pmErrorCodes.h.in pmErrorCodes.dat pmErrorCodes.c.in
Note: See TracChangeset for help on using the changeset viewer.