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

sebastic pushed a commit to branch master
in repository ncview.

commit c9b53c1d51bb7bdb61cdf1b088575759b3e07d70
Merge: 41c3610 e4bdbc1
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Sat Apr 18 01:40:25 2015 +0200

    Merge tag 'upstream/2.1'
    
    Upstream version 2.1

 .gmtcommands4                          |    0
 Makefile                               |  627 ------
 Makefile.in                            |   16 +-
 README_LOCAL                           |    4 +
 aclocal.m4                             |    2 +-
 autom4te.cache/output.0                |  983 ++++++----
 autom4te.cache/output.1                |  983 ++++++----
 autom4te.cache/requests                |   22 +-
 autom4te.cache/traces.0                |  280 +--
 autom4te.cache/traces.1                |  303 ++-
 config.h                               |   80 -
 config.h.in                            |    3 +
 config.h.in~                           |    3 +
 config.log                             | 1304 -------------
 config.status                          | 1085 -----------
 configure                              |  981 ++++++----
 configure.in                           |   95 +-
 m4macros/png.m4                        |  119 ++
 m4macros/ppm.m4                        |  109 --
 m4macros/udunits2.m4                   |   17 +-
 src/.deps/RadioWidget.Po               |  291 ---
 src/.deps/SciPlot.Po                   |  138 --
 src/.deps/calcalcs.Po                  |   86 -
 src/.deps/cbar.Po                      |  298 ---
 src/.deps/dataedit.Po                  |  289 ---
 src/.deps/display_info.Po              |  289 ---
 src/.deps/do_buttons.Po                |  287 ---
 src/.deps/do_print.Po                  |  287 ---
 src/.deps/epic_time.Po                 |  287 ---
 src/.deps/file.Po                      |  287 ---
 src/.deps/file_netcdf.Po               |  287 ---
 src/.deps/filesel.Po                   |  288 ---
 src/.deps/geteuid.Po                   |   74 -
 src/.deps/interface.Po                 |  289 ---
 src/.deps/ncview.Po                    |  310 ---
 src/.deps/overlay.Po                   |  294 ---
 src/.deps/plot_range.Po                |  291 ---
 src/.deps/plot_xy.Po                   |  288 ---
 src/.deps/printer_options.Po           |  289 ---
 src/.deps/range.Po                     |  290 ---
 src/.deps/set_options.Po               |  291 ---
 src/.deps/udu.Po                       |  289 ---
 src/.deps/utCalendar2_cal.Po           |   93 -
 src/.deps/util.Po                      |  292 ---
 src/.deps/utils.Po                     |  288 ---
 src/.deps/view.Po                      |  287 ---
 src/.deps/x_interface.Po               |  300 ---
 src/.overlay.c.swp                     |  Bin 16384 -> 0 bytes
 src/Makefile                           |  703 -------
 src/Makefile.am                        |   14 +-
 src/Makefile.in                        |   68 +-
 src/RadioWidget.o                      |  Bin 5832 -> 0 bytes
 src/SciPlot.o                          |  Bin 81032 -> 0 bytes
 src/calcalcs.o                         |  Bin 33808 -> 0 bytes
 src/cbar.o                             |  Bin 140048 -> 0 bytes
 src/colormaps_banded.h                 |   44 +
 src/colormaps_blu_red.h                |   44 +
 src/colormaps_blue_red.h               |   44 +
 src/colormaps_bright.h                 |   44 +
 src/colormaps_jaisn2.h                 |   44 +
 src/colormaps_jaisnb.h                 |   44 +
 src/colormaps_jaisnc.h                 |   44 +
 src/colormaps_jaisnd.h                 |   44 +
 src/colormaps_jaison.h                 |   44 +
 src/colormaps_jet.h                    |   37 +
 src/colormaps_manga.h                  |   40 +
 src/colormaps_rainbow.h                |   44 +
 src/colormaps_roullet.h                |   40 +
 src/colormaps_wheel.h                  |   40 +
 src/dataedit.o                         |  Bin 9040 -> 0 bytes
 src/display_info.o                     |  Bin 4904 -> 0 bytes
 src/do_buttons.c                       |    8 +-
 src/do_buttons.o                       |  Bin 7472 -> 0 bytes
 src/do_print.o                         |  Bin 20880 -> 0 bytes
 src/epic_time.o                        |  Bin 3488 -> 0 bytes
 src/file.c                             |   63 +-
 src/file.o                             |  Bin 15520 -> 0 bytes
 src/file_netcdf.c                      |   51 +-
 src/file_netcdf.o                      |  Bin 41584 -> 0 bytes
 src/filesel.o                          |  Bin 13008 -> 0 bytes
 src/geteuid                            |  Bin 9516 -> 0 bytes
 src/geteuid.o                          |  Bin 1560 -> 0 bytes
 src/handle_rc_file.c                   |  165 ++
 src/interface.o                        |  Bin 12120 -> 0 bytes
 src/interface/RadioWidget.c            |   33 +-
 src/interface/RadioWidget.h            |   10 +-
 src/interface/cbar.c                   |   35 +-
 src/interface/colormap_funcs.c         |  760 ++++++++
 src/interface/filesel.c                |   19 +-
 src/interface/interface.c              |    9 +
 src/interface/make_tc_data.c           |  181 ++
 src/interface/plot_range.c             |    5 +-
 src/interface/plot_xy.c                |   10 +-
 src/interface/printer_options.c        |   21 +-
 src/interface/range.c                  |    5 +-
 src/interface/set_options.c            |  719 ++++++-
 src/interface/x_interface.c            |  710 +++----
 src/interface/x_interface.dumpframes.c | 3280 --------------------------------
 src/ncview                             |  Bin 3206105 -> 0 bytes
 src/ncview.c                           |   70 +-
 src/ncview.defines.h                   |  112 +-
 src/ncview.includes.h                  |    3 +
 src/ncview.o                           |  Bin 131864 -> 0 bytes
 src/ncview.protos.h                    |   42 +-
 src/overlay.c                          |   15 +-
 src/overlay.o                          |  Bin 1670896 -> 0 bytes
 src/plot_range.o                       |  Bin 8704 -> 0 bytes
 src/plot_xy.o                          |  Bin 24560 -> 0 bytes
 src/printer_options.o                  |  Bin 21472 -> 0 bytes
 src/range.o                            |  Bin 17632 -> 0 bytes
 src/set_options.o                      |  Bin 11992 -> 0 bytes
 src/stringlist.c                       | 1206 ++++++++++++
 src/stringlist.h                       |   73 +
 src/tsh                                |    1 +
 src/udu.c                              |   47 +-
 src/udu.o                              |  Bin 10248 -> 0 bytes
 src/utCalendar2_cal.c                  |  111 +-
 src/utCalendar2_cal.o                  |  Bin 17424 -> 0 bytes
 src/util.c                             | 1227 +++++++-----
 src/util.o                             |  Bin 48912 -> 0 bytes
 src/util_2009-01-01.c                  | 1877 ------------------
 src/utils.o                            |  Bin 1736 -> 0 bytes
 src/view.c                             |  162 +-
 src/view.o                             |  Bin 85712 -> 0 bytes
 src/x_interface.o                      |  Bin 124288 -> 0 bytes
 stamp-h1                               |    1 -
 126 files changed, 7750 insertions(+), 18758 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