Skip to content

Commit

Permalink
Merge branch 'sandboxie-plus:master' into langupdt007
Browse files Browse the repository at this point in the history
  • Loading branch information
offhub authored Sep 2, 2023
2 parents 6fa83e1 + 1af82bb commit 20f8b2e
Show file tree
Hide file tree
Showing 12 changed files with 4 additions and 1 deletion.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- added an option to minimize Sandboxie to the System Tray by clicking minimize button [3252](https://github.com/sandboxie-plus/Sandboxie/issues/3252)

### Changed
- moved tray option to an own tab
- moved tray option to an own tab
- repalced some graphics with better compressed once (thanks idealths)

### Fixed
- fixed subscription certificate recognition issue
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified SandboxiePlus/SandMan/Resources/Actions/StartMenu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified SandboxiePlus/SandMan/Resources/Advanced.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified SandboxiePlus/SandMan/Resources/AdvancedD.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified SandboxiePlus/SandMan/Resources/Classic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified SandboxiePlus/SandMan/Resources/ClassicD.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified SandboxiePlus/SandMan/Resources/LayoutAndGroups.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions SandboxiePlus/SandMan/Resources/SandMan.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,8 @@
<file>Actions/ResetFont.png</file>
<file>Actions/Dll.png</file>
<file>SideLogoDM.png</file>
<file>Actions/TaskBar.png</file>
<file>Actions/Desktop.png</file>
</qresource>
<qresource prefix="/Boxes">
<file alias="Busy">Boxes/BusyOverlay.png</file>
Expand Down
Binary file modified SandboxiePlus/SandMan/Resources/Simple.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified SandboxiePlus/SandMan/Resources/SimpleD.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 20f8b2e

Please sign in to comment.