| commit | e8d32ed930e6dc3108507a1eaac6b005f4ca8455 | |
| author | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Tue, 16 Apr 2013 01:02:55 +0000 (16 04:02 +0300) | ||
| committer | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Tue, 16 Apr 2013 01:02:55 +0000 (16 04:02 +0300) | ||
| tree | ca27b8cfb47b1f7dfe2b667c6ac8b606b3bf1321 | treesnapshot (tar.gz zip) |
| parent | a85619270d7f9431aa40231d81783b254e96ff49 | commitdiff |
| parent | 3ab8f196ec5fa4c756b40786bd2232e8c36e2d1d | commitdiff |
Merge branch 'rr1-maint'
Conflicts:
src/core/movie.cpp
Conflicts:
src/core/movie.cpp
| src/library/movie.cpp | diff1 | diff2 | blobhistory |