| commit | 7d0acfbaec30d2f95b4ef6abf0079b3a575fe6e3 | |
| author | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Fri, 5 Apr 2013 17:09:31 +0000 (5 20:09 +0300) | ||
| committer | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Fri, 5 Apr 2013 17:09:31 +0000 (5 20:09 +0300) | ||
| tree | 9e3b8e74642b012c1408242e163ee993869bcb8b | treesnapshot (tar.gz zip) |
| parent | bd39b322ce0321298fb1cd837be763e23d6fad80 | commitdiff |
| parent | bfaf627c6682968f3932b5925d19093e0a910896 | commitdiff |
Merge branch 'rr1-maint'
Conflicts:
src/core/mainloop.cpp
Conflicts:
src/core/mainloop.cpp
| include/core/controllerframe.hpp | diff1 | diff2 | blobhistory |
| src/core/controllerframe.cpp | diff1 | diff2 | blobhistory |
| src/core/mainloop.cpp | diff1 | diff2 | blobhistory |