The following commit has been merged in the master branch:
commit 095fe3daf70c38860d9265c60f6dff811d537bfe
Merge: 02635d20c1f3fb11feca1d52dce32eb45208db0a 
118d80c211c063d0059edc01c5061095ca923b49
Author: David Paleino <da...@debian.org>
Date:   Sun Dec 2 09:32:06 2012 +0100

    Merge tag 'upstream/1.1d'
    
    Upstream version 1.1d
    
    Conflicts:
        Makefile.am
        Makefile.in
        README
        configure
        configure.ac
        epsilon/Makefile.am
        epsilon/Makefile.in
        epsilon/bit_io.c
        epsilon/bit_io.h
        epsilon/checksum.c
        epsilon/checksum.h
        epsilon/cobs.c
        epsilon/cobs.h
        epsilon/color.c
        epsilon/color.h
        epsilon/common.c
        epsilon/common.h
        epsilon/daub97lift.h
        epsilon/dc_level.c
        epsilon/dc_level.h
        epsilon/epsilon.h
        epsilon/filter.c
        epsilon/filter.h
        epsilon/filterbank.c
        epsilon/filterbank.h
        epsilon/libmain.c
        epsilon/libmain.h
        epsilon/list.c
        epsilon/list.h
        epsilon/mem_alloc.c
        epsilon/mem_alloc.h
        epsilon/merge_split.c
        epsilon/merge_split.h
        epsilon/pad.c
        epsilon/pad.h
        epsilon/resample.c
        epsilon/resample.h
        epsilon/speck.c
        epsilon/speck.h
        headers/rasterlite.h
        headers/rasterlite_internals.h
        lib/Makefile.in
        lib/rasterlite.c
        lib/rasterlite_aux.c
        lib/rasterlite_gif.c
        lib/rasterlite_image.c
        lib/rasterlite_io.c
        lib/rasterlite_jpeg.c
        lib/rasterlite_png.c
        lib/rasterlite_quantize.c
        lib/rasterlite_tiff.c
        lib/rasterlite_wavelet.c
        makefile.vc
        nmake.opt
        src/rasterlite_grid.c
        src/rasterlite_load.c
        src/rasterlite_pyramid.c
        src/rasterlite_tool.c
        src/rasterlite_topmost.c


-- 
library supporting raster data sources for spatialite

_______________________________________________
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