| commit | 7cc7dd8551057e35ae1de16b93be172a96a7c5d4 | |
| author | metlos <krejci.l@centrum.cz> | |
| Sun, 30 Mar 2008 16:54:17 +0000 (30 17:54 +0100) | ||
| committer | metlos <krejci.l@centrum.cz> | |
| Sun, 30 Mar 2008 16:54:17 +0000 (30 17:54 +0100) | ||
| tree | 1a44e79583b809a07f57aa36c1a505500bfa7338 | treesnapshot (tar.gz zip) |
| parent | 34aa02270d81e6db1f3845c4aae13d8f680944bc | commitdiff |
| parent | 9320513e74c516e39c4728671b37820ea76a4ff2 | commitdiff |
Merge branch 'proper_wait_and_notify'
Conflicts:
src/beacon/invokable.hpp
Conflicts:
src/beacon/invokable.hpp
| src/beacon/event_queue.cpp | diff1 | diff2 | blobhistory |
| src/beacon/fast_signal.hpp | diff1 | diff2 | blobhistory |
| src/beacon/invokable.hpp | diff1 | diff2 | blobhistory |