[med-svn] [probabel] 04/04: Merge remote-tracking branch 'origin/master'

[Lennart Karssen]

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

lckarssen-guest pushed a commit to branch master
in repository probabel.

commit 6e8160ac4c39dc20e540f965ae487e91f94012e6
Merge: 2723e98 5f7d7de
Author: L.C. Karssen <lennart at karssen.org>
Date:   Wed Jan 15 15:59:17 2014 +0100

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
            debian/changelog
            doc/Makefile.in
            src/Makefile.in
    
    All conflicts resolved.

 compile         |  143 ----
 debian/rules    |    2 +-
 depcomp         |  630 ----------------
 doc/Makefile.in |  580 ---------------
 install-sh      |  520 -------------
 src/Makefile.in | 2220 -------------------------------------------------------
 6 files changed, 1 insertion(+), 4094 deletions(-)

diff --cc debian/rules
index 5700f17,d8273b3..3e61093
--- a/debian/rules
+++ b/debian/rules
@@@ -1,6 -1,6 +1,6 @@@
  #!/usr/bin/make -f
  
- #DH_VERBOSE := 1
 -DH_VERBOSE := 1
++# DH_VERBOSE := 1
  
  # some helpful variables
  # shamelessly stolen from http://jmtd.net/log/awk/

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/probabel.git