]> rtime.felk.cvut.cz Git - orte.git/commitdiff
projects / orte.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e714437 098b0de)
Merge branch 'master' of ssh://git@rtime.felk.cvut.cz/orte into android
authorMartin Vajnar <martin.vajnar@gmail.com>
Thu, 12 Sep 2013 15:55:46 +0000 (17:55 +0200)
committerMartin Vajnar <martin.vajnar@gmail.com>
Thu, 12 Sep 2013 15:55:46 +0000 (17:55 +0200)
1  2 
orte/manager/ortemanager.c patch | diff1 | diff2 | blob | history

diff --cc orte/manager/ortemanager.c
Simple merge
Mirror of ORTE from Git on SourceForge. ORTE is open-source implementation of real-time publish-subscribe protocol.