]> rtime.felk.cvut.cz Git - pes-rpp/rpp-lib.git/commitdiff
projects / pes-rpp / rpp-lib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 054ee07 df6acc7)
Merge branch 'master' of git@rtime.felk.cvut.cz:pes-rpp/rpp-lib into personal/vajnama... personal/vajnamar/for-master
authorMartin Vajnar <martin.vajnar@gmail.com>
Thu, 30 Jul 2015 12:28:38 +0000 (14:28 +0200)
committerMartin Vajnar <martin.vajnar@gmail.com>
Thu, 30 Jul 2015 12:28:38 +0000 (14:28 +0200)

Trivial merge