diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-12-28 14:40:03 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-12-28 14:40:03 +0000 |
commit | fc3a735d42a0dcd748b6b8dc2c63bafde01effd0 (patch) | |
tree | 9b40fc63ccdb80ebec638a8c31e73c17f8dbbaeb /xserver/hw/xquartz | |
parent | da8308393b93d5c87075d65ace98cd249643e165 (diff) |
Update to xserver 1.14.5
Diffstat (limited to 'xserver/hw/xquartz')
-rw-r--r-- | xserver/hw/xquartz/X11Controller.m | 2 | ||||
-rw-r--r-- | xserver/hw/xquartz/bundle/Info.plist.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xserver/hw/xquartz/X11Controller.m b/xserver/hw/xquartz/X11Controller.m index 737db42e7..3d094bfc7 100644 --- a/xserver/hw/xquartz/X11Controller.m +++ b/xserver/hw/xquartz/X11Controller.m @@ -936,7 +936,7 @@ extern char *bundle_id_prefix; - (void) applicationWillTerminate:(NSNotification *)aNotification { - unsigned remain; + int remain; [X11App prefs_synchronize]; /* shutdown the X server, it will exit () for us. */ diff --git a/xserver/hw/xquartz/bundle/Info.plist.cpp b/xserver/hw/xquartz/bundle/Info.plist.cpp index b0106c6da..4b4a894a4 100644 --- a/xserver/hw/xquartz/bundle/Info.plist.cpp +++ b/xserver/hw/xquartz/bundle/Info.plist.cpp @@ -19,9 +19,9 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>2.7.4</string> + <string>2.7.5</string> <key>CFBundleVersion</key> - <string>2.7.4</string> + <string>2.7.5</string> <key>CFBundleSignature</key> <string>x11a</string> <key>CSResourcesFileMapped</key> @@ -39,9 +39,9 @@ <key>LSApplicationCategoryType</key> <string>public.app-category.utilities</string> <key>NSHumanReadableCopyright</key> - <string>© 2003-2012 Apple Inc. + <string>© 2003-2013 Apple Inc. © 2003 XFree86 Project, Inc. -© 2003-2012 X.org Foundation, Inc. +© 2003-2013 X.org Foundation, Inc. </string> <key>NSMainNibFile</key> <string>main</string> |