Merge branch 'rr1-maint'
commite31084cc2bed1bfd64deaf5bd9ec927df9b1c3db
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 29 May 2013 17:20:31 +0000 (29 20:20 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 29 May 2013 17:20:31 +0000 (29 20:20 +0300)
tree06b0eb42ede1b9e611094e008d0d1ff692090514
parent0658872a7fcd7c2422f153655ecd541a8060ae5f
parent1ee295f6de56994775cfe3f4771d2066bfaf7fc7
Merge branch 'rr1-maint'
src/core/moviedata.cpp