[felix-gogo-shell] 04/12: Merge tag 'upstream/0.12.0'

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository felix-gogo-shell.

commit 0f0da367d56966d59f0a6b24973d4e7f3f2e4426
Merge: ca01c54 2c85f58
Author: Markus Koschany <apo at debian.org>
Date:   Sat Nov 21 18:02:38 2015 +0100

    Merge tag 'upstream/0.12.0'
    
    Upstream version 0.12.0
    
    # gpg: Signature made Sat 21 Nov 2015 18:02:35 CET using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 doc/changelog.txt                                  |  13 ++
 pom.xml                                            |   8 +-
 .../org/apache/felix/gogo/options/Options.java     |  11 +-
 .../org/apache/felix/gogo/shell/Activator.java     | 165 ++++++++------
 .../java/org/apache/felix/gogo/shell/Console.java  |  50 ++++-
 .../java/org/apache/felix/gogo/shell/History.java  | 177 +++++++++++++++
 .../java/org/apache/felix/gogo/shell/Shell.java    |  24 ++-
 .../org/apache/felix/gogo/shell/HistoryTest.java   | 240 +++++++++++++++++++++
 8 files changed, 606 insertions(+), 82 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/felix-gogo-shell.git