summaryrefslogtreecommitdiff
path: root/sd/inc/glob.hrc
diff options
context:
space:
mode:
authorAndre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM>2010-07-08 12:27:24 +0200
committerAndre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM>2010-07-08 12:27:24 +0200
commit436416a6320037855846fce127a0cfa77ac45270 (patch)
tree2a6326eecb06a6996d68580df4b8260515c46b4c /sd/inc/glob.hrc
parentdf76bfb0695d19d201936df80192108e7ce51b8c (diff)
renaissance1: resolved merge conflicts, cleanup.
Diffstat (limited to 'sd/inc/glob.hrc')
-rwxr-xr-x[-rw-r--r--]sd/inc/glob.hrc0
1 files changed, 0 insertions, 0 deletions
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index 89b2b670adf9..89b2b670adf9 100644..100755
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc