[Pkg-octave-commit] [matlab2tikz] 01/05: Merge tag 'upstream/0.4.6'

[Thomas Weber]

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

tweber pushed a commit to branch master
in repository matlab2tikz.

commit 5e5c77c2d1518e8e5ddbe09a278de7fecd56e552
Merge: 76210a5 1fb06b7
Author: Thomas Weber <tweber at debian.org>
Date:   Tue Feb 18 13:53:31 2014 +0100

    Merge tag 'upstream/0.4.6'
    
    Upstream version 0.4.6
    
    Conflicts:
    Upstream ships a .gitignore file as well now - our .gitignore file was
    merged with it

 .gitignore                     |  10 +-
 ChangeLog                      |  19 +-
 Makefile                       |   2 +-
 README.md                      |   8 -
 src/matlab2tikz.m              | 747 +++++++++++++++++++++++++++--------------
 src/matlab2tikzInputParser.m   |  14 +-
 src/updater.m                  |   2 +-
 test/data/.gitignore           |   7 -
 test/matlab2tikz_acidtest.m    |  39 ++-
 test/testfunctions.m           |  50 ++-
 tools/cleanfigure.m            |  10 +-
 tools/figure2dot.m             |   2 +-
 version-0.4.4 => version-0.4.6 |   0
 13 files changed, 604 insertions(+), 306 deletions(-)

diff --cc .gitignore
index f19fcfc,5676067..671ad85
--- a/.gitignore
+++ b/.gitignore
@@@ -1,7 -1,7 +1,15 @@@
+ test*-reference.pdf
+ test*-reference.eps
+ test*-converted*
+ # exclude files generated by test suite
+ !.gitignore
+ # git cannot presently store empty directories, so committing the
+ # .gitignore file makes sure the directory isn't actually empty
++
++# Debian specific files
 +*~
 +.pc
 +debian/files
 +debian/matlab2tikz.debhelper.log
 +debian/matlab2tikz.substvars
 +debian/matlab2tikz/
- 

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/matlab2tikz.git