Context Navigation

init.c

Timestamp:

Jan 12, 2015, 12:29:24 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-pv3-20140717-merge/Ohana

Files:

Property svn:mergeinfo set to

/branches/eam_branches/ipp-20140206/Ohana	merged	eligible
/branches/eam_branches/ipp-20140214/Ohana	merged	eligible
/branches/eam_branches/ipp-20140226/Ohana	merged	eligible
/branches/eam_branches/ipp-20140402/Ohana	merged	eligible
/branches/eam_branches/ipp-20140423/Ohana	merged	eligible
/branches/eam_branches/ipp-20140610/Ohana	merged	eligible
/branches/eam_branches/ipp-20140717/Ohana	merged	eligible
/branches/eam_branches/ipp-20140813/Ohana	merged	eligible
/branches/eam_branches/ipp-20140904/Ohana	merged	eligible
/branches/eam_branches/ipp-ops-20130712/Ohana	merged	eligible
/branches/eam_branches/ps2-tc3-20130727/Ohana	merged	eligible
/tags/ipp-20130712/Ohana	merged	eligible
/tags/ipp-20140114/Ohana	merged	eligible
/tags/ipp-20141119/Ohana	merged	eligible
/tags/ipp-20141224/Ohana	merged	eligible
/trunk/Ohana	merged	eligible

-              r37049
+              r37822
 int calmextract     PROTO((int, char **));
 int catlog          PROTO((int, char **));
+int catname         PROTO((int, char **));
 int catdir_define   PROTO((int, char **));
 int ccd             PROTO((int, char **));
 …
 //  {1, "calextract",  calextract,   "extract photometry calibration"},
 //  {1, "calmextract", calmextract,  "extract photometry calibration"},
+  {1, "catname",     catname,      "list catalog files by name"},
   {1, "catdir",      catdir_define,"re-define CATDIR"},
 //  {1, "ccd",         ccd,          "plot color-color diagram"},

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