]> rtime.felk.cvut.cz Git - omk.git/commitdiff
projects / omk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e13bf93 c51b16e)
Merge branch 'master' of pisa@rtime.felk.cvut.cz:/var/git/omk
authorPavel Pisa <pisa@cmp.felk.cvut.cz>
Wed, 20 Jan 2010 14:30:02 +0000 (15:30 +0100)
committerPavel Pisa <pisa@cmp.felk.cvut.cz>
Wed, 20 Jan 2010 14:30:02 +0000 (15:30 +0100)

Trivial merge
Ocera Make System