aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Tad <tad@spotco.us>2018-06-14 07:57:37 -0400
committerLibravatar Tad <tad@spotco.us>2018-06-14 07:57:37 -0400
commit65373cc14d2b3a86bce2aa4175e92cee867b7069 (patch)
tree59642444335973a9d372f8ab87c1b26b303327ed
parentMerge pull request #1996 from flacks/profiles/gnome-mpv (diff)
downloadfirejail-65373cc14d2b3a86bce2aa4175e92cee867b7069.tar.gz
firejail-65373cc14d2b3a86bce2aa4175e92cee867b7069.tar.zst
firejail-65373cc14d2b3a86bce2aa4175e92cee867b7069.zip
merges
-rw-r--r--README1
-rw-r--r--README.md2
-rw-r--r--RELNOTES2
-rw-r--r--src/firecfg/firecfg.config1
4 files changed, 4 insertions, 2 deletions
diff --git a/README b/README
index 93df77151..5b5ff86ab 100644
--- a/README
+++ b/README
@@ -312,6 +312,7 @@ Jean Lucas (https://github.com/flacks)
312 - add nvm to list of disabled interpreters 312 - add nvm to list of disabled interpreters
313 - fixes for tor-browser-en 313 - fixes for tor-browser-en
314 - alias for riot-desktop 314 - alias for riot-desktop
315 - add gnome-mpv profile
315Jericho (https://github.com/attritionorg) 316Jericho (https://github.com/attritionorg)
316 - spelling 317 - spelling
317Jesse Smith (https://github.com/slicer69) 318Jesse Smith (https://github.com/slicer69)
diff --git a/README.md b/README.md
index 5a3ab3a3e..70f2f8447 100644
--- a/README.md
+++ b/README.md
@@ -101,4 +101,4 @@ We also keep a list of profile fixes for previous released versions in [etc-fixe
101# Current development version: 0.9.55 101# Current development version: 0.9.55
102 102
103## New profiles 103## New profiles
104Microsoft Office Online, riot-desktop 104Microsoft Office Online, riot-desktop, gnome-mpv
diff --git a/RELNOTES b/RELNOTES
index c56fa4071..b49ba939c 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -4,7 +4,7 @@ firejail (0.9.55) baseline; urgency=low
4 * support full paths in private-lib 4 * support full paths in private-lib
5 * globbing support in private-lib 5 * globbing support in private-lib
6 * new profiles: ms-excel, ms-office, ms-onenote, ms-outlook, ms-powerpoint 6 * new profiles: ms-excel, ms-office, ms-onenote, ms-outlook, ms-powerpoint
7 * new profiles: ms-skype, ms-word, riot-desktop 7 * new profiles: ms-skype, ms-word, riot-desktop, gnome-mpv
8 -- netblue30 <netblue30@yahoo.com> Fri, 25 May 2018 08:00:00 -0500 8 -- netblue30 <netblue30@yahoo.com> Fri, 25 May 2018 08:00:00 -0500
9 9
10firejail (0.9.54) baseline; urgency=low 10firejail (0.9.54) baseline; urgency=low
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index d7a1f946f..f124c1465 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -173,6 +173,7 @@ gnome-font-viewer
173gnome-logs 173gnome-logs
174gnome-maps 174gnome-maps
175gnome-mplayer 175gnome-mplayer
176gnome-mpv
176gnome-music 177gnome-music
177gnome-photos 178gnome-photos
178gnome-recipes 179gnome-recipes