Index: /trunk/Ohana/src/addstar/doc/merge.txt
===================================================================
--- /trunk/Ohana/src/addstar/doc/merge.txt	(revision 3523)
+++ /trunk/Ohana/src/addstar/doc/merge.txt	(revision 3523)
@@ -0,0 +1,30 @@
+
+the goal of this project is to merge the functionality of the four
+addstar-like programs in DVO: addstar, addrefs, addspphot, addusno.  
+
+files which are identical or could be in all four:
+
+addstar/src/aregion.c
+addstar/src/addstar.c
+addstar/src/args.c
+addstar/src/calibrate.c
+addstar/src/check_permissions.c
+addstar/src/ConfigInit.c
+addstar/src/find_matches.c
+addstar/src/gcatalog.c
+addstar/src/gimages.c
+addstar/src/gregions.c
+addstar/src/gstars.c
+addstar/src/mkcatalog.c
+addstar/src/parse_time.c
+addstar/src/sort_lists.c
+addstar/src/wcatalog.c
+addstar/src/wimage.c
+
+files to watch:
+[eugene@kawelu src]$ ll addstar/src/
+-rw-rw-r--    1 eugene   eugene       3658 Nov 24 14:13 calibrate.c
+
+[eugene@kawelu src]$ ll addspphot/src/
+total 116
+-rw-rw-r--    1 eugene   eugene       4480 Nov 24 15:18 calibrate.c
Index: /trunk/Ohana/src/imregister/base/version.c
===================================================================
--- /trunk/Ohana/src/imregister/base/version.c	(revision 3522)
+++ /trunk/Ohana/src/imregister/base/version.c	(revision 3523)
@@ -8,4 +8,7 @@
   fprintf (stderr, "%s\n", version);
   fprintf (stderr, "%s\n", name);
+
+  fprintf (stderr, "ohana: %s\n", ohana_version());
+  fprintf (stderr, "fits:  %s\n", fits_version());
   exit (2);
 
Index: /trunk/Ohana/src/mosastro/bin/.cvsignore
===================================================================
--- /trunk/Ohana/src/mosastro/bin/.cvsignore	(revision 3523)
+++ /trunk/Ohana/src/mosastro/bin/.cvsignore	(revision 3523)
@@ -0,0 +1,1 @@
+*.linux *.lin64 *.sol *.sun *.sid *.hp *.irix
Index: /trunk/Ohana/src/opihi/doc/coords.list
===================================================================
--- /trunk/Ohana/src/opihi/doc/coords.list	(revision 3523)
+++ /trunk/Ohana/src/opihi/doc/coords.list	(revision 3523)
@@ -0,0 +1,47 @@
+./cmd.astro/cgrid.c - OK (graph only)
+./cmd.astro/cplot.c  - OK (graph only)
+./cmd.astro/czplot.c - OK (graph only)
+./cmd.data/cursor.c - OK (graph only)
+./dvo/catalog.c - OK (graph only)
+./dvo/pcat.c - OK (graph)
+./dvo/pmeasure.c - OK (graph)
+./dvo/procks.c - OK (graph)
+./dvo/showtile.c - OK (graph)
+./cmd.astro/coords.c - fixed
+./dvo/gimages.c - fixed
+./dvo/ImageOps.c - fixed
+./dvo/images.c - fixed
+./dvo/imdense.c - fixed
+./dvo/imextract.c - fixed
+./dvo/imlist.c - fixed
+./dvo/imstats.c - fixed
+./dvo/photometry.c - fixed
+./dvo/subpix.c - fixed
+./dvo/get_regions.c - fixed
+
+./cmd.astro/drizzle.c - needs work
+./cmd.astro/transform.c - needs work
+./cmd.data/load.c - needs work
+./cmd.data/point.c - needs work
+./cmd.data/tvgrid.c - needs work
+./dvo/cmpread.c - needs work (single image)
+./dvo/imbox.c - needs work (single image)
+./dvo/simage.c - needs work (single image)
+
+dvo commands / functions affected by WRP / DIS astrometry
+
+LoadImage - no
+badimages.c - yes : also, use LoadImages
+get_regions.c - ? : OK if we register DIS image
+gimages.c
+ImageOps.c        : need to make association with DIS
+images.c
+imbox.c
+imdense.c
+imextract.c
+imlist.c
+imstats.c
+photometry.c
+showtile.c
+simage.c
+subpix.c