[pktools] 375/375: Merge branch 'master' of git.sv.gnu.org:/srv/git/pktools Merge after edit in myfann_cpp.h in Windows

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch upstream-master
in repository pktools.

commit 36cdcc932d49e7811615dc78664a66b6f2db602a
Merge: 2c6c02f 3463b66
Author: Pieter Kempeneers <kempenep at gmail.com>
Date:   Tue Dec 2 15:14:51 2014 +0100

    Merge branch 'master' of git.sv.gnu.org:/srv/git/pktools
    Merge after edit in myfann_cpp.h in Windows

 src/algorithms/myfann_cpp.h                    | 18 ++++++++++++------
 vis_studio/algorithm/algorithm.vcxproj         |  6 ++++++
 vis_studio/algorithm/algorithm.vcxproj.filters |  6 ++++++
 vis_studio/base/base.vcxproj                   |  3 +++
 vis_studio/fileclasses/fileclasses.vcxproj     |  2 ++
 vis_studio/imageclasses/imageclasses.vcxproj   |  2 ++
 vis_studio/pkann/pkann.vcxproj                 |  2 ++
 vis_studio/pkascii2img/pkascii2img.vcxproj     |  6 ++++--
 vis_studio/pkcomposit/pkcomposit.vcxproj       |  2 ++
 vis_studio/pkcreatect/pkcreatect.vcxproj       |  2 ++
 vis_studio/pkcrop/pkcrop.vcxproj               |  2 ++
 vis_studio/pkdiff/pkdiff.vcxproj               |  2 ++
 vis_studio/pkdsm2shadow/pkdsm2shadow.vcxproj   |  2 ++
 vis_studio/pkdumpimg/pkdumpimg.vcxproj         |  6 ++++--
 vis_studio/pkegcs/pkegcs.vcxproj               |  2 ++
 vis_studio/pkextract/pkextract.vcxproj         |  2 ++
 vis_studio/pkfillnodata/pkfillnodata.vcxproj   |  6 ++++--
 vis_studio/pkfilter/pkfilter.vcxproj           |  2 ++
 vis_studio/pkfilterascii/pkfilterascii.vcxproj |  2 ++
 vis_studio/pkfilterdem/pkfilterdem.vcxproj     |  2 ++
 vis_studio/pkfsann/pkfsann.vcxproj             |  2 ++
 vis_studio/pkfssvm/pkfssvm.vcxproj             |  2 ++
 vis_studio/pkgetmask/pkgetmask.vcxproj         |  6 ++++--
 vis_studio/pkinfo/pkinfo.vcxproj               |  2 ++
 vis_studio/pkoptsvm/pkoptsvm.vcxproj           |  2 ++
 vis_studio/pkpolygonize/pkpolygonize.vcxproj   |  6 ++++--
 vis_studio/pkreclass/pkreclass.vcxproj         |  6 ++++--
 vis_studio/pkregann/pkregann.vcxproj           |  2 ++
 vis_studio/pksetmask/pksetmask.vcxproj         |  6 ++++--
 vis_studio/pksieve/pksieve.vcxproj             |  2 ++
 vis_studio/pkstatascii/pkstatascii.vcxproj     |  2 ++
 vis_studio/pkstatogr/pkstatogr.vcxproj         |  2 ++
 vis_studio/pksvm/pksvm.vcxproj                 |  2 ++
 33 files changed, 99 insertions(+), 20 deletions(-)

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