Skip to content

Commit 26c12c1

Browse files
committed
Merge branch 'release/3.1.0'
2 parents cc74eef + 5440c26 commit 26c12c1

File tree

6 files changed

+2876
-1161
lines changed

6 files changed

+2876
-1161
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 3.0.0
2+
current_version = 3.1.0
33
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>\w+))?
44
commit = True
55
tag = False

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
MODEL_GENERATOR_VERSION=5.0.0
1+
MODEL_GENERATOR_VERSION=5.3.0
22
modelgenerator=bin/modelgenerator-$(MODEL_GENERATOR_VERSION).jar
33

4-
MINCER_VERSION=3.0.0
4+
MINCER_VERSION=3.2.0
55
mincer=bin/mincer-$(MINCER_VERSION).jar
66

77
# Available flavors for data

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0
1+
3.1.0

raw/cs/Moduldaten.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
<abstract-unit id="P-PHY-L-MAME2b" title="Übungen zu Mathematische Methoden der Physik II" type="m" semester="3,5"/>
166166
<abstract-unit id="P-PHY-L-MAME2c" title="Ergänzungen zu Mathematische Methoden der Physik II" type="m" semester="3,5"/>
167167
</module>
168-
<module id="P-PHY-M-GP1" title="Grundpraktikum I" pordnr="2101" elective-units="0" bundled="true">
168+
<module id="P-PHY-M-GP1" title="Grundpraktikum I" pordnr="2101" elective-units="0" bundled="true">
169169
<abstract-unit id="P-PHY-L-GP1" title="Grundpraktikum I" type="m" semester="4,6"/>
170170
</module>
171171
<module id="P-PHY-M-OPT" title="Optik" pordnr="2102" elective-units="0" bundled="true">
@@ -1260,13 +1260,9 @@
12601260
<unit id="MAME2u" title="Übungen zu Mathematische Methoden der Physik II" semester="3,5">
12611261
<group>
12621262
<session day="wed" time="3" duration="2" rhythm="0"/>
1263-
<session day="wed" time="3" duration="2" rhythm="0"/>
1264-
<session day="wed" time="3" duration="2" rhythm="0"/>
12651263
</group>
12661264
<group>
12671265
<session day="wed" time="4" duration="2" rhythm="0"/>
1268-
<session day="wed" time="4" duration="2" rhythm="0"/>
1269-
<session day="wed" time="4" duration="2" rhythm="0"/>
12701266
</group>
12711267
<abstract-unit id="P-PHY-L-MAME2b"/>
12721268
</unit>

0 commit comments

Comments
 (0)