summaryrefslogtreecommitdiff
path: root/ooo.lst
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2010-06-18 14:39:04 +0200
committerJoachim Lingner <jl@openoffice.org>2010-06-18 14:39:04 +0200
commitb36b76d359d0fd1af79de234c6a7d1b8c131b599 (patch)
treea878a5c5b7936efa8889bbd387e1a89012b9396b /ooo.lst
parent59494b23082369daed9e631c86d9130f38a5242b (diff)
jl153 #i11877# #i11875# merging ooo.lst after rebasing
Diffstat (limited to 'ooo.lst')
-rwxr-xr-x[-rw-r--r--]ooo.lst0
1 files changed, 0 insertions, 0 deletions
diff --git a/ooo.lst b/ooo.lst
index efaf6b6cd..efaf6b6cd 100644..100755
--- a/ooo.lst
+++ b/ooo.lst