]> rtime.felk.cvut.cz Git - pes-rpp/rpp-test-sw.git/commitdiff
projects / pes-rpp / rpp-test-sw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc39168 713651f)
Merge branch 'master' of git@rtime.felk.cvut.cz:rpp-test-sw into personal/vajnamar...
authorMartin Vajnar <martin.vajnar@gmail.com>
Fri, 24 Jul 2015 11:06:26 +0000 (13:06 +0200)
committerMartin Vajnar <martin.vajnar@gmail.com>
Fri, 24 Jul 2015 11:06:26 +0000 (13:06 +0200)

Trivial merge