| commit | a85619270d7f9431aa40231d81783b254e96ff49 | |
| author | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Tue, 16 Apr 2013 00:45:00 +0000 (16 03:45 +0300) | ||
| committer | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Tue, 16 Apr 2013 00:45:00 +0000 (16 03:45 +0300) | ||
| tree | cd8736ebe06058788e46862e5ba9b295c09421e6 | treesnapshot (tar.gz zip) |
| parent | b7e3329db36bd32a221b3ec30b6b3a6f6a9dbffe | commitdiff |
| parent | f1399d2f2eea3262c5b56a5687517af51acacba9 | commitdiff |
Merge branch 'rr1-maint'
Conflicts:
include/core/movie.hpp
src/core/movie.cpp
Conflicts:
include/core/movie.hpp
src/core/movie.cpp
| include/library/movie.hpp | diff1 | diff2 | blobhistory |
| src/library/movie.cpp | diff1 | diff2 | blobhistory |