diff options
author | marha <marha@users.sourceforge.net> | 2010-04-16 15:34:33 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-04-16 15:34:33 +0000 |
commit | 0b8629ada4293370d220bbb7e6c195c711baee7d (patch) | |
tree | a7774b45662db90282ae18b17eb3d8f77d8c746d /xorg-server/hw/xquartz/bundle/Resources/no.lproj | |
parent | 8654ee514b4d79feec936501717a06892090d3b7 (diff) | |
download | vcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.tar.gz vcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.tar.bz2 vcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.zip |
svn merge -r534:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/bundle/Resources/no.lproj')
-rw-r--r-- | xorg-server/hw/xquartz/bundle/Resources/no.lproj/Localizable.strings | bin | 2576 -> 2758 bytes |
-rw-r--r-- | xorg-server/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib | bin | 50330 -> 50084 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/xorg-server/hw/xquartz/bundle/Resources/no.lproj/Localizable.strings b/xorg-server/hw/xquartz/bundle/Resources/no.lproj/Localizable.strings Binary files differindex 68d86fd78..506282a4e 100644 --- a/xorg-server/hw/xquartz/bundle/Resources/no.lproj/Localizable.strings +++ b/xorg-server/hw/xquartz/bundle/Resources/no.lproj/Localizable.strings diff --git a/xorg-server/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib b/xorg-server/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib Binary files differindex 562302f71..30933f438 100644 --- a/xorg-server/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib +++ b/xorg-server/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib |