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

diff options

author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2009-05-12 15:27:47 +0100
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:26:17 +0200
commit	11eaf8617b69300cbb8331a4599d83b71b49fe7a (patch)
tree	1adfc9c7870d0abb8b636a1fb2853546cbcfa5e8 /.gitattributes
parent	4830131b7866b0a1d5008761cd938f8fcf674104 (diff)
parent	ea774f0633d15826f88fe16385b4b76c06b15f5c (diff)
parent	b676c957b7d7adb297071c7ee60b815245e761ff (diff)
parent	e1df37a0b030398f1c46ca9c674be3a80f2f3ac0 (diff)
parent	4a936beb9482551fc636c0d9a68bba3cbb5bb29a (diff)
parent	73e73a3010413751dd558cb73145bc3f91862522 (diff)
parent	a9efcf1f69c85703e7cf680e5eb4df14a8757dc9 (diff)
parent	899553712cb4da9b0f20b4971366ece6a2e24934 (diff)
parent	b7be2a230fd72613e56d7897ab6e91f702e5558a (diff)
parent	aba787163d07ae3d2d7dc1aeb6b942314ffe8b4a (diff)
parent	a0b0b136ef8b02d58c85ec2b221f6f654e5e7b2f (diff)
parent	a06c4636e8a16148ea577564df75a0554cb01add (diff)
parent	b72bd5f30735f5b0ee61bf06919a1934bb5b37eb (diff)
parent	7dabeb48fed10d15232f54350e7e08dc1a5c84b2 (diff)
parent	2b32dbf4c13187d9c9ba5539f337a2980b32e2c0 (diff)
parent	8b2b985438f971e38e32d9cf6506cd1c838775ef (diff)
parent	cce880c5d8f64fbb0d85f3923e070fad64268f6d (diff)
parent	fb5712a71fa548ea69f1652ac7159d5bc91ef564 (diff)
parent	79566f8ca9dda5609c3b13f83646f48b1baad006 (diff)

merged tag ooo/DEV300_m48ooo/DEV300_m48