Merge branch 'master' into missingGraphics

511f1c87 · Simon Eismann · dc23f935 · a591e60c · 511f1c87 · 511f1c87
Commit 511f1c87 authored Jun 28, 2016 by Simon Eismann
20 changed files
--- a/part2/actions.pdf
+++ b/part2/actions.pdf
--- a/part2/adaptation_points_example.pdf
+++ b/part2/adaptation_points_example.pdf
--- a/part2/collect_phase_control_flow.pdf
+++ b/part2/collect_phase_control_flow.pdf
--- a/part2/composite_component_example.pdf
+++ b/part2/composite_component_example.pdf
--- a/part2/e2e-modeling.pdf
+++ b/part2/e2e-modeling.pdf
--- a/part2/fw-architecture.pdf
+++ b/part2/fw-architecture.pdf
--- a/part2/fw_sequence_diagram.pdf
+++ b/part2/fw_sequence_diagram.pdf
--- a/part2/mm-adaptation_points.pdf
+++ b/part2/mm-adaptation_points.pdf
--- a/part2/mm-adaptation_process.pdf
+++ b/part2/mm-adaptation_process.pdf
--- a/part2/mm-container_templates_repository.pdf
+++ b/part2/mm-container_templates_repository.pdf
--- a/part2/mm-core.pdf
+++ b/part2/mm-core.pdf
--- a/part2/mm-deployment.pdf
+++ b/part2/mm-deployment.pdf
--- a/part2/mm-resource_configuration.pdf
+++ b/part2/mm-resource_configuration.pdf
--- a/part2/mm-resource_landscape.pdf
+++ b/part2/mm-resource_landscape.pdf
--- a/part2/mm-runtime_environment_classes.pdf
+++ b/part2/mm-runtime_environment_classes.pdf
--- a/part2/model-based_adaptation_process.pdf
+++ b/part2/model-based_adaptation_process.pdf
--- a/part2/model_calibration.pdf
+++ b/part2/model_calibration.pdf
--- a/part2/multilevel_modeling_container_template.pdf
+++ b/part2/multilevel_modeling_container_template.pdf
--- a/part2/peropteryx-sta_instance.pdf
+++ b/part2/peropteryx-sta_instance.pdf
--- a/part2/proactive_analysis_wcf.pdf
+++ b/part2/proactive_analysis_wcf.pdf