diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-28 15:21:45 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-28 15:21:45 +0100 |
| commit | 59bda88ffb9deb72a727e7d6b4c141fd7d4678f4 (patch) | |
| tree | a797879cc0fe54172dba50354b635b1f595081db /xorg-server/hw/xquartz/bundle/Info.plist.cpp | |
| parent | 829194c926fa1e3bd45e4fe740e0bc42efe6ace6 (diff) | |
| parent | 1aee8dafb5391e093f3a111f906ab0d8b6775510 (diff) | |
| download | vcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.tar.gz vcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.tar.bz2 vcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winclipboardunicode.c
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winengine.c
xorg-server/hw/xwin/winkeybd.c
xorg-server/hw/xwin/winkeybd.h
xorg-server/hw/xwin/winkeynames.h
xorg-server/hw/xwin/winmouse.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
xorg-server/hw/xwin/winprefs.c
xorg-server/hw/xwin/winwindow.h
xorg-server/hw/xwin/winwndproc.c
Diffstat (limited to 'xorg-server/hw/xquartz/bundle/Info.plist.cpp')
| -rw-r--r-- | xorg-server/hw/xquartz/bundle/Info.plist.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/hw/xquartz/bundle/Info.plist.cpp b/xorg-server/hw/xquartz/bundle/Info.plist.cpp index a4b8e1926..4b6d9d182 100644 --- a/xorg-server/hw/xquartz/bundle/Info.plist.cpp +++ b/xorg-server/hw/xquartz/bundle/Info.plist.cpp @@ -19,9 +19,9 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>2.7.0</string> + <string>2.7.2</string> <key>CFBundleVersion</key> - <string>2.7.0</string> + <string>2.7.2</string> <key>CFBundleSignature</key> <string>x11a</string> <key>CSResourcesFileMapped</key> @@ -37,9 +37,9 @@ <key>LSApplicationCategoryType</key> <string>public.app-category.utilities</string> <key>NSHumanReadableCopyright</key> - <string>© 2003-2011 Apple Inc. + <string>© 2003-2012 Apple Inc. © 2003 XFree86 Project, Inc. -© 2003-2011 X.org Foundation, Inc. +© 2003-2012 X.org Foundation, Inc. </string> <key>NSMainNibFile</key> <string>main</string> |