[Pkg-ocaml-maint-commits] [marionnet] 02/19: Merge tag 'upstream/0.90+bzr506'
Lucas Nussbaum
lucas at moszumanska.debian.org
Mon Oct 30 22:28:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
lucas pushed a commit to branch master
in repository marionnet.
commit 48b9e2ae6d801cdeaacd022c4c6deb51c551a190
Merge: c9ea72a 2416155
Author: Lucas Nussbaum <lucas at debian.org>
Date: Mon Oct 9 08:06:21 2017 +0200
Merge tag 'upstream/0.90+bzr506'
Upstream version 0.90+bzr506
CONFIGME | 18 +-
Makefile | 115 +-
Makefile.local | 30 +-
cable.ml | 50 +-
chip/chip.ml | 820 ----
chip/chip.mli | 515 ---
chip/chip_example.ml | 126 -
chip/chip_parser_p4.ml | 421 --
chip/chip_parser_p4.old_version.ml | 529 ---
chip/wGButton.ml | 91 -
cloud.ml | 5 +-
compatibility/forest_backward_compatibility.ml | 16 +
configuration.ml | 7 +
configuration.mli | 8 +
cow_files.ml | 2 +-
daemon_client.ml | 50 +-
daemon_language.ml | 147 +-
descendants_monitor.ml | 2 +-
disk.ml | 63 +-
disk.mli | 17 +-
gettext.ml | 9 +-
global_options.ml | 38 +-
gui/gui_bricks.ml | 487 ++-
gui/gui_bricks.mli | 122 +-
gui/gui_dialog_A_PROPOS.ml | 2 +-
gui/gui_dialog_toolkit.ml | 2 +-
gui/gui_menubar_MARIONNET.ml | 55 +-
gui/gui_source_editing.ml | 21 +-
gui/gui_toolbar_COMPONENTS_layouts.ml | 2 +-
gui/gui_toolbar_DOT_TUNING.ml | 23 +-
gui/ledgrid.ml | 4 +-
gui/ledgrid_manager.ml | 5 +-
gui/menu_factory.ml | 2 +-
gui/menu_factory.mli | 4 +-
gui/simple_dialogs.ml | 25 +-
gui/talking.ml | 211 +-
gui/talking.mli | 100 +-
hub.ml | 3 +
initialization.ml | 16 +-
machine.ml | 228 +-
marionnet-daemon.ml | 371 +-
marionnet.ml | 47 +-
meta.ml.released | 12 +-
motherboard.ml | 11 -
motherboard_builder.ml | 300 +-
motherboard_builder.mli | 3 +-
po/messages.pot | 532 ++-
router.ml | 791 +++-
scripts/marionnet_telnet.sh | 129 +
serial.ml | 8 +-
share/images/README | 9 +
share/images/ico.cable-serial-left-right.large.png | Bin 2680 -> 2680 bytes
share/images/ico.cable-serial-left-right.small.png | Bin 979 -> 979 bytes
share/images/ico.cable-serial.small.png | Bin 4903 -> 4903 bytes
share/images/ico.cable-serial.xxl.png | Bin 19983 -> 19983 bytes
share/images/ico.dado-no.24.png | Bin 1744 -> 1744 bytes
share/images/ico.dado.24.png | Bin 1567 -> 1567 bytes
share/images/ico.diffuser.orig.png | Bin 2744 -> 2744 bytes
share/images/ico.hardware-gray.small.png | Bin 3186 -> 3186 bytes
share/images/ico.resource-2.med.png | Bin 8111 -> 8111 bytes
share/images/ico.script-analyse-3.med.png | Bin 5093 -> 5093 bytes
share/images/ico.script-finish.med.png | Bin 5625 -> 5625 bytes
share/images/ico.script-start-2.med.png | Bin 6798 -> 6798 bytes
share/images/ico.snapshot.42x42.png | Bin 0 -> 2828 bytes
share/images/ico.snapshot.svg | 4531 ++++++++++++++++++++
share/images/ico.software-gray.small.png | Bin 3126 -> 3126 bytes
share/images/ico.uml-gray.small.png | Bin 2192 -> 2192 bytes
share/images/ico.xml-16.inv.png | Bin 702 -> 702 bytes
share/images/launcher-icons/marionnet-launcher.png | Bin 5414 -> 5414 bytes
share/images/marionnet-launcher.png | Bin 5414 -> 5414 bytes
share/marionnet.conf | 1 -
share/quagga_zebra.lang | 307 ++
simulation_level.ml | 224 +-
simulation_level.mli | 195 +-
sketch.ml | 230 +
sketch.mli | 74 +
state.ml | 830 ++--
switch.ml | 73 +-
task_runner.mli | 38 +
test_with_utop.sh | 64 +
treeview.ml | 299 +-
treeview_defects.ml | 24 +-
treeview_documents.ml | 100 +-
treeview_history.ml | 115 +-
treeview_ifconfig.ml | 118 +-
uml/guest/marionnet-relay | 43 +-
uml/kernel/CONFIG-3.2.51 | 1172 +++++
uml/kernel/CONFIG-3.2.64 | 1272 ++++++
uml/pupisto.buildroot/Makefile | 2 +-
uml/pupisto.buildroot/README.buildroot | 19 +
uml/pupisto.buildroot/pupisto.buildroot.sh | 4 +-
.../pupisto.buildroot.sh.files/nanorc | 2 +-
.../pupisto.buildroot.sh.files/quagga/bgpd.conf | 6 +-
.../pupisto.buildroot.sh.files/quagga/isisd.conf | 7 +-
.../pupisto.buildroot.sh.files/quagga/ospf6d.conf | 6 +-
.../pupisto.buildroot.sh.files/quagga/ospfd.conf | 6 +-
.../pupisto.buildroot.sh.files/quagga/quagga | 23 +-
.../pupisto.buildroot.sh.files/quagga/ripd.conf | 6 +-
.../pupisto.buildroot.sh.files/quagga/ripngd.conf | 6 +-
.../pupisto.buildroot.sh.files/quagga/zebra.conf | 7 +-
.../quagga/zebrasrv.conf | 6 +-
uml/pupisto.common/toolkit_chroot.sh | 68 +-
uml/pupisto.debian/Makefile | 2 +-
uml/pupisto.debian/pupisto.debian.sh | 2 +-
useful-scripts/marionnet_from_scratch | 136 +-
user_level.ml | 401 +-
user_level.mli | 673 +++
world_bridge.ml | 197 +-
world_gateway.ml | 5 +-
x.ml | 267 +-
x.mli | 6 +-
111 files changed, 13170 insertions(+), 5001 deletions(-)
--
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