]> rtime.felk.cvut.cz Git - rpp-test-sw.git/commitdiff
projects / rpp-test-sw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 675ebd7 f403f2f)
Merge branch 'rm48/master' of rtime.felk.cvut.cz:rpp-test-sw into rm48/master
authorMichal Horn <hornmich@fel.cvut.cz>
Tue, 9 Dec 2014 16:11:14 +0000 (17:11 +0100)
committerMichal Horn <hornmich@fel.cvut.cz>
Tue, 9 Dec 2014 16:11:14 +0000 (17:11 +0100)

Trivial merge