[Pkg-ocaml-maint-commits] [marionnet] 03/04: Merge tag 'upstream/0.90.6+bzr457'

[Lucas Nussbaum]

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

lucas pushed a commit to branch master
in repository marionnet.

commit d017dea0c4f2d96244baa58551b0731da35f42da
Merge: df19d3b f92c89b
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Tue Jul 8 11:32:20 2014 +0200

    Merge tag 'upstream/0.90.6+bzr457'
    
    Upstream version 0.90.6+bzr457

 configuration.ml                                   |    1 +
 descendants_monitor.ml                             |    2 +-
 gui/gui_bricks.ml                                  |   35 +
 gui/gui_bricks.mli                                 |    8 +
 initialization.ml                                  |   16 +-
 meta.ml.released                                   |   10 +-
 po/messages.pot                                    |   80 +-
 router.ml                                          |  100 +-
 share/marionnet.conf                               |    1 +
 simulation_level.ml                                |   10 +-
 uml/guest/bashrc                                   |   16 +-
 uml/guest/marionnet-relay                          |   34 +-
 uml/pupisto.buildroot/Makefile                     |    6 +-
 uml/pupisto.buildroot/README.buildroot             |   23 +-
 uml/pupisto.buildroot/pupisto.buildroot.sh         |   40 +-
 .../pupisto.buildroot.sh.files/nanorc              | 2534 ++++++++++++++++++++
 uml/pupisto.common/toolkit_chroot.sh               |   76 +-
 uml/pupisto.common/toolkit_config_files.sh         |    6 +-
 uml/pupisto.debian/Makefile                        |    8 +-
 uml/pupisto.debian/pupisto.debian.sh               |  129 +-
 uml/pupisto.kernel/pupisto.kernel.sh               |    2 +-
 useful-scripts/marionnet_from_scratch              |   14 +-
 x.ml                                               |   38 +-
 x.mli                                              |    7 +-
 24 files changed, 3009 insertions(+), 187 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git