diff --git a/docs/changes.txt b/docs/changes.txt index 31ffb62152..6e596796fb 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -34,7 +34,7 @@ Changes in behaviour which may result in build errors need to request it explicitly, e.g. `wx-config --libs std,webview`. -3.1.0: (released 2014-xx-xx) +3.1.0: (released 2015-xx-xx) ---------------------------- - Many improvements for high DPI monitors support, notably XRC now interprets diff --git a/docs/doxygen/mainpages/copyright.h b/docs/doxygen/mainpages/copyright.h index 245983246b..76f1f09cb3 100644 --- a/docs/doxygen/mainpages/copyright.h +++ b/docs/doxygen/mainpages/copyright.h @@ -11,7 +11,7 @@ @section section_copyright wxWidgets Copyrights and Licenses -Copyright (c) 1992-2013 Julian Smart, Vadim Zeitlin, Stefan Csomor, Robert +Copyright (c) 1992-2015 Julian Smart, Vadim Zeitlin, Stefan Csomor, Robert Roebling, and other members of the wxWidgets team, please see the acknowledgements section below. diff --git a/docs/doxygen/regen.sh b/docs/doxygen/regen.sh index f644ef0f41..e3d7198d45 100755 --- a/docs/doxygen/regen.sh +++ b/docs/doxygen/regen.sh @@ -185,7 +185,7 @@ if [[ "$1" = "docset" ]]; then defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetFeedURL $ATOMDIR/$ATOM defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetFallbackURL http://docs.wxwidgets.org defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetDescription "API reference and conceptual documentation for wxWidgets 3.0" - defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info NSHumanReadableCopyright "Copyright 1992-2014 wxWidgets team, Portions 1996 Artificial Intelligence Applications Institute" + defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info NSHumanReadableCopyright "Copyright 1992-2015 wxWidgets team, Portions 1996 Artificial Intelligence Applications Institute" defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info isJavaScriptEnabled true defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info dashIndexFilePath index.html defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetPlatformFamily wx diff --git a/interface/wx/aboutdlg.h b/interface/wx/aboutdlg.h index 23ffb172a0..a969be105b 100644 --- a/interface/wx/aboutdlg.h +++ b/interface/wx/aboutdlg.h @@ -37,7 +37,7 @@ aboutInfo.SetName("MyApp"); aboutInfo.SetVersion(MY_APP_VERSION_STRING); aboutInfo.SetDescription(_("My wxWidgets-based application!")); - aboutInfo.SetCopyright("(C) 1992-2010"); + aboutInfo.SetCopyright("(C) 1992-2015"); aboutInfo.SetWebSite("http://myapp.org"); aboutInfo.AddDeveloper("My Self"); diff --git a/interface/wx/generic/aboutdlgg.h b/interface/wx/generic/aboutdlgg.h index b2f59cc13a..61746d6c5b 100644 --- a/interface/wx/generic/aboutdlgg.h +++ b/interface/wx/generic/aboutdlgg.h @@ -34,7 +34,7 @@ aboutInfo.SetName("MyApp"); aboutInfo.SetVersion(MY_APP_VERSION_STRING); aboutInfo.SetDescription(_("My wxWidgets-based application!")); - aboutInfo.SetCopyright("(C) 1992-2012"); + aboutInfo.SetCopyright("(C) 1992-2015"); aboutInfo.SetWebSite("http://myapp.org"); aboutInfo.AddDeveloper("My Self"); diff --git a/samples/Info.plist b/samples/Info.plist index 90a597eeb5..58faa60181 100644 --- a/samples/Info.plist +++ b/samples/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 3.1.0, (c) 2005-2014 wxWidgets + $(PRODUCT_NAME) version 3.1.0, (c) 2005-2015 wxWidgets CFBundleIconFile wxmac.icns CFBundleIdentifier @@ -15,7 +15,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 3.1.0, (c) 2005-2013 wxWidgets + 3.1.0, (c) 2005-2015 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType @@ -31,6 +31,6 @@ LSRequiresCarbon NSHumanReadableCopyright - Copyright 2005-2011 wxWidgets + Copyright 2005-2015 wxWidgets diff --git a/samples/docview/Info.plist b/samples/docview/Info.plist index 3d1902af50..442085df28 100644 --- a/samples/docview/Info.plist +++ b/samples/docview/Info.plist @@ -51,7 +51,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 3.1.0, (c) 2005-2013 wxWidgets + $(PRODUCT_NAME) version 3.1.0, (c) 2005-2015 wxWidgets CFBundleIconFile doc CFBundleIdentifier @@ -66,7 +66,7 @@ it CFBundleLongVersionString - 3.1.0, (c) 2005-2013 wxWidgets + 3.1.0, (c) 2005-2015 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType @@ -82,6 +82,6 @@ LSRequiresCarbon NSHumanReadableCopyright - Copyright 2005-2013 wxWidgets + Copyright 2005-2015 wxWidgets diff --git a/samples/minimal/Info_carbon.plist b/samples/minimal/Info_carbon.plist index 231fbf5f20..5be5defe7a 100644 --- a/samples/minimal/Info_carbon.plist +++ b/samples/minimal/Info_carbon.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 3.1.0, (c) 2005-2013 wxWidgets + $(PRODUCT_NAME) version 3.1.0, (c) 2005-2015 wxWidgets CFBundleIconFile wxmac.icns CFBundleIdentifier @@ -22,7 +22,7 @@ it CFBundleLongVersionString - 3.1.0, (c) 2005-2013 wxWidgets + 3.1.0, (c) 2005-2015 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType @@ -34,6 +34,6 @@ CFBundleVersion 3.1.0 NSHumanReadableCopyright - Copyright 2005-2013 wxWidgets + Copyright 2005-2015 wxWidgets diff --git a/samples/minimal/Info_cocoa.plist b/samples/minimal/Info_cocoa.plist index 47eb09a56e..1fe9be7278 100644 --- a/samples/minimal/Info_cocoa.plist +++ b/samples/minimal/Info_cocoa.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 3.1.0, (c) 2005-2013 wxWidgets + $(PRODUCT_NAME) version 3.1.0, (c) 2005-2015 wxWidgets CFBundleIconFile wxmac.icns CFBundleIdentifier @@ -22,7 +22,7 @@ it CFBundleLongVersionString - 3.1.0, (c) 2005-2013 wxWidgets + 3.1.0, (c) 2005-2015 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType @@ -34,7 +34,7 @@ CFBundleVersion 3.1.0 NSHumanReadableCopyright - Copyright 2005-2013 wxWidgets + Copyright 2005-2015 wxWidgets NSPrincipalClass wxNSApplication diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 8d5ad10203..aa0323418d 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -1441,7 +1441,7 @@ wxVersionInfo wxGetLibraryVersionInfo() wxMINOR_VERSION, wxRELEASE_NUMBER, msg, - wxS("Copyright (c) 1995-2014 wxWidgets team")); + wxS("Copyright (c) 1995-2015 wxWidgets team")); } void wxInfoMessageBox(wxWindow* parent) diff --git a/src/msw/version.rc b/src/msw/version.rc index 84e1ec0ca6..333740a9ce 100644 --- a/src/msw/version.rc +++ b/src/msw/version.rc @@ -92,7 +92,7 @@ BEGIN VALUE "FileDescription", "wxWidgets " WXLIBDESC " library\0" VALUE "FileVersion", wxVERSION_NUM_DOT_STRING "\0" VALUE "InternalName", wxSTRINGIZE(WXDLLNAME) "\0" - VALUE "LegalCopyright", "Copyright © 1993-2014 wxWidgets development team\0" + VALUE "LegalCopyright", "Copyright © 1993-2015 wxWidgets development team\0" VALUE "OriginalFilename", wxSTRINGIZE(WXDLLNAME) ".dll\0" VALUE "ProductName", "wxWidgets\0" VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0" diff --git a/src/osx/carbon/Info.plist.in b/src/osx/carbon/Info.plist.in index f53a692e68..558c18bc18 100644 --- a/src/osx/carbon/Info.plist.in +++ b/src/osx/carbon/Info.plist.in @@ -32,11 +32,11 @@ CFBundleShortVersionString VERSION CFBundleGetInfoString - EXECUTABLE version VERSION, (c) 2002-2012 wxWidgets + EXECUTABLE version VERSION, (c) 2002-2015 wxWidgets CFBundleLongVersionString - VERSION, (c) 2002-2012 wxWidgets + VERSION, (c) 2002-2015 wxWidgets NSHumanReadableCopyright - Copyright 2002-2012 wxWidgets + Copyright 2002-2015 wxWidgets LSRequiresCarbon CSResourcesFileMapped