This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository ncview.
commit 79cc5eb080aae85435ae2b72d47fad26733bcc1a
Merge: 135958a ea9a76a
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sat Apr 18 01:31:04 2015 +0200
Merge tag 'upstream/1.93h'
Upstream version 1.93h
Conflicts:
README_LOCAL
ncview-1.93g/ncview.defines.h => ' | 12 +-
ncview-1.93g/Makefile.in => Makefile | 44 +-
ncview-1.93g/Makefile.default => Makefile.bak | 62 +-
README | 90 +-
README_LOCAL | 2 +-
SciPlot.o | Bin 0 -> 207232 bytes
ncview-1.93g/configure => autom4te.cache/output.0 | 7385 +-
configure => autom4te.cache/output.1 | 4079 +-
autom4te.cache/requests | 240 +
autom4te.cache/traces.0 | 426 +
autom4te.cache/traces.1 | 116 +
config.log | 816 +
config.status | 793 +
configure | 7117 +-
configure.in | 124 +
do_buttons.c | 3 +-
do_buttons.o | Bin 0 -> 22112 bytes
ncview-1.93g/do_print.orig.c => do_print.c.orig | 23 -
do_print.o | Bin 0 -> 41280 bytes
epic_time.o | Bin 0 -> 14264 bytes
file.o | Bin 0 -> 43832 bytes
file_netcdf.o | Bin 0 -> 100392 bytes
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 --
geteuid | Bin 0 -> 12836 bytes
geteuid.c | 3 +-
geteuid.o | Bin 0 -> 6272 bytes
hole.nc | Bin 0 -> 1832 bytes
hotres.Rmap | 3 +
install-appdef | 14 +-
interface/RadioWidget.o | Bin 0 -> 41928 bytes
interface/cbar.o | Bin 0 -> 155688 bytes
interface/dataedit.o | Bin 0 -> 46120 bytes
interface/display_info.o | Bin 0 -> 38808 bytes
interface/filesel.o | Bin 0 -> 56864 bytes
interface/interface.o | Bin 0 -> 36696 bytes
interface/plot_range.o | Bin 0 -> 45040 bytes
interface/plot_xy.o | Bin 0 -> 76608 bytes
interface/printer_options.o | Bin 0 -> 62344 bytes
interface/range.o | Bin 0 -> 64736 bytes
interface/set_options.o | Bin 0 -> 53024 bytes
interface/utils.o | Bin 0 -> 33296 bytes
interface/x_interface.o | Bin 0 -> 252736 bytes
ncmap_2_rmap.R | 33 +
ncview | Bin 0 -> 3560906 bytes
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.solaris | 110 -
ncview-1.93g/Ncview-appdefaults | 129 -
ncview-1.93g/README | 66 -
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/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/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.bitmaps.h | 90 -
ncview-1.93g/ncview.c | 1331 -
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 -
ncview-1.93g/ncview.1.sed => ncview.1 | 21 +-
ncview.defines.h | 2 +-
ncview.o | Bin 0 -> 153904 bytes
netcdf.m4 | 137 +
overlay.c | 3 +-
overlay.o | Bin 0 -> 1698912 bytes
t.xwd | Bin 0 -> 535185 bytes
tsh | 4 +
tt | 9523 ++
udu.o | Bin 0 -> 52864 bytes
udunits.tar | Bin 1194496 -> 0 bytes
util.c | 348 +-
util.o | Bin 0 -> 111760 bytes
view.c | 25 +-
view.o | Bin 0 -> 149600 bytes
145 files changed, 20392 insertions(+), 248812 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
