merged tag ooo/DEV300_m87 - libreoffice/core - main, development code repository

diff options

author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2010-08-27 13:40:18 +0100
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:36:34 +0200
commit	fd15cc3ed78a78a9d177f71cce6f9baae144423e (patch)
tree	e7ad211610c057be6e780b6121a34a75dd368a05 /avmedia/inc/avmedia/mediaplayer.hxx
parent	0d1451b0e4b0960e1f0efead540c6a30100c3bba (diff)
parent	9b1bd766cb389a3c8d0414bb6274732da115c452 (diff)
parent	7b95c82b3e920e7006ff4ef1871edb84612d21f7 (diff)
parent	9f9a5b17168bb18d90602bab5771bff9aff7625e (diff)
parent	0badf8094b28ceb44f2e65787eed93982fe0c0ea (diff)
parent	ec38ffb43215161d6f0f8769f870e76850c8161c (diff)
parent	c257abf34ec2fd6e1814211fa01342dc843b671e (diff)
parent	ea05895ea96c47c7ee35fcbd3b208b2286c9a8b9 (diff)
parent	40e1e1a4b2c190ffd71e17d83fc9f00c81d7d5b1 (diff)
parent	3099107b00be8af1e6864e105326af77e401f7f2 (diff)
parent	b12644eb20d8153243943d22e5923e06afebd637 (diff)
parent	52dce173df6bbcc79126c63a7736ef3f6c21a706 (diff)
parent	e97e1bf62b4b7de61edf760a77de7e55afa93d84 (diff)
parent	fa4b286294a272b085c2f74e12581edc2343fc18 (diff)
parent	cec7c8658a3e1267e01de1077f6d407335b2c820 (diff)
parent	3839427b7c198238aa31b5958b3b4744c630d42a (diff)
parent	04873f78c8cd0594d1beaabe50f8cb38135eb665 (diff)
parent	3813e349c8c3a7ac14af729085614fccb59fa5a5 (diff)
parent	3d341c8efb7aa4784b3341ef752c16e07df5d951 (diff)

merged tag ooo/DEV300_m87ooo/DEV300_m87