SomeNet / public repos / pub / jan / aic18.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f486985 fbe022b)
Merge branch '4-bpnm-adaption'
authorDavid Kaufmann <david.kaufmann@student.tuwien.ac.at>
Thu, 8 Nov 2018 16:21:58 +0000 (17:21 +0100)
committerDavid Kaufmann <david.kaufmann@student.tuwien.ac.at>
Thu, 8 Nov 2018 16:21:58 +0000 (17:21 +0100)

Trivial merge