mirror of
https://github.com/munki/munki.git
synced 2026-05-05 03:49:22 -05:00
Merge branch 'master' of https://github.com/munki/munki into MSCMojave
# Conflicts: # code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj # code/apps/Managed Software Center/Managed Software Center/Base.lproj/MainMenu.xib # code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift # code/apps/Managed Software Center/Managed Software Center/Resources/WebResources/updates.css # code/apps/Managed Software Center/Managed Software Center/en-AU.lproj/InfoPlist.strings # code/apps/Managed Software Center/Managed Software Center/msclog.swift
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>Copyright © 2019 The Munki Project. All rights reserved.</string>
|
||||
<string>Copyright © 2019-2020 The Munki Project. All rights reserved.</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string>MSCDockTilePlugin</string>
|
||||
</dict>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
File: MSCDockTilePlugIn.h
|
||||
|
||||
Copyright 2015-2019 Greg Neagle.
|
||||
Copyright 2015-2020 Greg Neagle.
|
||||
Liberally adapted from Apple sample code:
|
||||
https://developer.apple.com/library/mac/samplecode/DockTile/Listings/DockTilePlugIn_DockTilePlugIn_h.html
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
File: MSCDockTilePlugIn.m
|
||||
|
||||
Copyright 2015-2019 Greg Neagle.
|
||||
Copyright 2015-2020 Greg Neagle.
|
||||
Liberally adapted from Apple sample code:
|
||||
https://developer.apple.com/library/mac/samplecode/DockTile/Listings/DockTilePlugIn_DockTilePlugIn_h.html
|
||||
|
||||
|
||||
Reference in New Issue
Block a user