]> 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: 7a2e9fb 3d26278)
Merge branch 'master' into personal/vajnamar/merge-fixes
authorMartin Vajnar <martin.vajnar@gmail.com>
Thu, 30 Jul 2015 12:26:59 +0000 (14:26 +0200)
committerMartin Vajnar <martin.vajnar@gmail.com>
Thu, 30 Jul 2015 12:26:59 +0000 (14:26 +0200)

Trivial merge