This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository ncview.

commit 0f09151933243bd72f92921bd596e547135c20cd
Merge: b021fcb f39ab7c
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Sat Apr 18 01:03:24 2015 +0200

    Merge tag 'upstream/1.93g'
    
    Upstream version 1.93g
    
    Conflicts:
        README

 README                                          |    90 +-
 genoverlay/Makefile                             |    22 +
 genoverlay/gengrid.f90                          |    22 +
 genoverlay/genoverlay.f90                       |   116 +
 genoverlay/genoverlay2.f90                      |   116 +
 genoverlay/genoverlay_radians.f90               |   120 +
 genoverlay/genoverlay_usa.f90                   |   165 +
 genoverlay/genoverlay_usa.orig.f90              |    84 +
 genoverlay/nc_overlay.earth.lat-lon.p8deg       |  5771 ++
 ncview-1.93g/3gauss.ncmap                       |   256 +
 ncview-1.93g/3saw.ncmap                         |   256 +
 ncview-1.93g/COPYING                            |   190 +
 ncview-1.93g/INSTALL                            |   131 +
 ncview-1.93g/Makefile.default                   |   122 +
 ncview-1.93g/Makefile.in                        |   141 +
 ncview-1.93g/Makefile.solaris                   |   110 +
 ncview-1.93g/Ncview-appdefaults                 |   129 +
 README => ncview-1.93g/README                   |     0
 ncview-1.93g/README.sgi                         |     7 +
 ncview-1.93g/README.solaris                     |    26 +
 ncview-1.93g/README_LOCAL                       |     1 +
 ncview-1.93g/README_WISH_LIST                   |    11 +
 ncview-1.93g/RELEASE_NOTES                      |    26 +
 ncview-1.93g/SciPlot.1                          |   685 +
 ncview-1.93g/SciPlot.c                          |  3475 +
 ncview-1.93g/SciPlot.h                          |   166 +
 ncview-1.93g/SciPlotP.h                         |   251 +
 ncview-1.93g/bw.ncmap                           |   256 +
 ncview-1.93g/colormaps_3gauss.h                 |    56 +
 ncview-1.93g/colormaps_3saw.h                   |    56 +
 ncview-1.93g/colormaps_bw.h                     |    56 +
 ncview-1.93g/colormaps_default.h                |    56 +
 ncview-1.93g/colormaps_detail.h                 |    56 +
 ncview-1.93g/colormaps_extrema.h                |    56 +
 ncview-1.93g/colormaps_helix.h                  |    56 +
 ncview-1.93g/colormaps_helix2.h                 |    56 +
 ncview-1.93g/colormaps_hotres.h                 |    56 +
 ncview-1.93g/colormaps_ssec.h                   |    56 +
 ncview-1.93g/configure                          |  9143 +++
 ncview-1.93g/default.ncmap                      |   256 +
 ncview-1.93g/detail.ncmap                       |   256 +
 ncview-1.93g/do_buttons.c                       |   296 +
 ncview-1.93g/do_print.c                         |   473 +
 ncview-1.93g/do_print.orig.c                    |   447 +
 ncview-1.93g/epic_time.c                        |   101 +
 ncview-1.93g/file.c                             |   647 +
 ncview-1.93g/file_netcdf.c                      |  1583 +
 ncview-1.93g/geteuid.c                          |     8 +
 ncview-1.93g/hotres.ncmap                       |   256 +
 ncview-1.93g/install-appdef                     |    70 +
 ncview-1.93g/install-sh                         |   251 +
 ncview-1.93g/interface/RadioWidget.c            |   206 +
 ncview-1.93g/interface/RadioWidget.h            |    48 +
 ncview-1.93g/interface/cbar.c                   |   884 +
 ncview-1.93g/interface/closed_circle_bitmap.h   |    29 +
 ncview-1.93g/interface/dataedit.c               |   246 +
 ncview-1.93g/interface/display_info.c           |   134 +
 ncview-1.93g/interface/fallback_resources.h     |    99 +
 ncview-1.93g/interface/filesel.c                |   403 +
 ncview-1.93g/interface/helvR08.h                |  2532 +
 ncview-1.93g/interface/interface.c              |   517 +
 ncview-1.93g/interface/open_circle_bitmap.h     |     6 +
 ncview-1.93g/interface/plot_range.c             |   218 +
 ncview-1.93g/interface/plot_xy.c                |   731 +
 ncview-1.93g/interface/printer_options.c        |   564 +
 ncview-1.93g/interface/range.c                  |   492 +
 ncview-1.93g/interface/set_options.c            |   341 +
 ncview-1.93g/interface/utils.c                  |    62 +
 ncview-1.93g/interface/widgets.h                |    99 +
 ncview-1.93g/interface/x_interface.c            |  3886 +
 ncview-1.93g/interface/x_interface.dumpframes.c |  3280 +
 ncview-1.93g/nc_overlay.earth.lat-lon.p8deg     |  5771 ++
 ncview-1.93g/nc_overlay.earth.lat-lon.radians   |  5771 ++
 ncview-1.93g/nc_overlay.lat-lon-grid.10x30      | 91835 ++++++++++++++++++++++
 ncview-1.93g/nc_overlay.lat-lon-grid.20x60      | 45019 +++++++++++
 ncview-1.93g/nc_overlay.usa                     | 12018 +++
 ncview-1.93g/ncview.1.sed                       |   366 +
 ncview-1.93g/ncview.bitmaps.h                   |    90 +
 ncview-1.93g/ncview.c                           |  1331 +
 ncview-1.93g/ncview.defines.h                   |   516 +
 ncview-1.93g/ncview.includes.h                  |    69 +
 ncview-1.93g/ncview.protos.h                    |   397 +
 ncview-1.93g/overlay.c                          |   694 +
 ncview-1.93g/overlay.orig.c                     |   441 +
 ncview-1.93g/overlay_coasts_p08deg.h            | 20845 +++++
 ncview-1.93g/overlay_coasts_p8deg.h             |   987 +
 ncview-1.93g/overlay_usa.h                      | 12703 +++
 ncview-1.93g/qsort.c                            |    31 +
 ncview-1.93g/udu.c                              |   317 +
 ncview-1.93g/utCalendar_cal.c                   |   685 +
 ncview-1.93g/utCalendar_cal.h                   |     3 +
 ncview-1.93g/util.c                             |  1944 +
 ncview-1.93g/util_2009-01-01.c                  |  1877 +
 ncview-1.93g/view.c                             |  2936 +
 udunits.tar                                     |   Bin 0 -> 1194496 bytes
 95 files changed, 248460 insertions(+), 55 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/ncview.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to