aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-12-16 16:32:31 +0000
committermarha <marha@users.sourceforge.net>2010-12-16 16:32:31 +0000
commite9cda97b38a5987aad2260f5153992d43bec16ce (patch)
tree94f0b93f5a343f528bec5474d222a510e4fb9442 /xorg-server/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
parentc59dda05406935ac1aaf11bf8cbd1b3140d8d115 (diff)
parentf851244b9298d88c29331ab285c2839d8bee6925 (diff)
downloadvcxsrv-e9cda97b38a5987aad2260f5153992d43bec16ce.tar.gz
vcxsrv-e9cda97b38a5987aad2260f5153992d43bec16ce.tar.bz2
vcxsrv-e9cda97b38a5987aad2260f5153992d43bec16ce.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib')
-rw-r--r--xorg-server/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nibbin45258 -> 44012 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/xorg-server/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib b/xorg-server/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
index 888424dfc..836d59532 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
Binary files differ