diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-11-16 09:38:30 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-16 09:38:30 +0100 |
| commit | 5ea8804a166ce06dd33d363b96a250e012bf3951 (patch) | |
| tree | 5ab33de3a0faa80e18a2aeb4610e8296b563d634 /bridges | |
| parent | f12505d5962153abc805e7c2fefbea8acca0d465 (diff) | |
| parent | 9f5b9dffa36d617e0d498b61ce8ba5ca3bd68691 (diff) | |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
cppu/util/target.pmk
Diffstat (limited to 'bridges')
0 files changed, 0 insertions, 0 deletions