]> rtime.felk.cvut.cz Git - frescor/streamer.git/commitdiff
projects / frescor / streamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48be63e 7a8edf5)
Merge branch 'demo' of molnam1@rtime.felk.cvut.cz:/var/git/frescor/streamer into...
authorMartin Molnar <molnam1@fel.cvut.cz>
Mon, 25 May 2009 19:59:15 +0000 (21:59 +0200)
committerMartin <molnam1@fel.cvut.cz>
Mon, 25 May 2009 19:59:15 +0000 (21:59 +0200)

Trivial merge
Unnamed repository; edit this file to name it for gitweb.