[Pkg-ocaml-maint-commits] [marionnet] branch master updated (7cfc044 -> 4852d25)
Lucas Nussbaum
lucas at moszumanska.debian.org
Tue Jul 8 09:50:59 UTC 2014
This is an automated email from the git hooks/post-receive script.
lucas pushed a change to branch master
in repository marionnet.
from 7cfc044 Add simple script to install testing images
adds a90acff Imported Upstream version 0.90.6+bzr448
new df19d3b Merge branch 'upstream'
new f92c89b Imported Upstream version 0.90.6+bzr457
new d017dea Merge tag 'upstream/0.90.6+bzr457'
new 4852d25 Update changelog post-merge.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
configuration.ml | 1 +
debian/changelog | 6 +
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 +-
25 files changed, 3015 insertions(+), 187 deletions(-)
create mode 100644 uml/pupisto.buildroot/pupisto.buildroot.sh.files/nanorc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git
More information about the Pkg-ocaml-maint-commits
mailing list