aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Tad <tad@spotco.us>2018-11-27 18:35:34 -0500
committerLibravatar Tad <tad@spotco.us>2018-11-27 18:37:02 -0500
commit042ea4d2f89035a34905dcef055b0e203daeb82f (patch)
treeab73e8136be235426add8834443b28a12dfc7d33
parentMerge pull request #2280 from pirate486743186/patch-2 (diff)
downloadfirejail-042ea4d2f89035a34905dcef055b0e203daeb82f.tar.gz
firejail-042ea4d2f89035a34905dcef055b0e203daeb82f.tar.zst
firejail-042ea4d2f89035a34905dcef055b0e203daeb82f.zip
merges
-rw-r--r--README2
-rw-r--r--README.md2
-rw-r--r--RELNOTES2
3 files changed, 4 insertions, 2 deletions
diff --git a/README b/README
index 758775088..1b5ff1d1b 100644
--- a/README
+++ b/README
@@ -469,6 +469,8 @@ PharmaceuticalCobweb (https://github.com/PharmaceuticalCobweb)
469 - added profile for gnome-ring 469 - added profile for gnome-ring
470pirate486743186 (https://github.com/pirate486743186) 470pirate486743186 (https://github.com/pirate486743186)
471 - KMail profile 471 - KMail profile
472 - mpsyt profile
473 - fix youtube-dl and mpv
472Pixel Fairy (https://github.com/xahare) 474Pixel Fairy (https://github.com/xahare)
473 - added fjclip.py, fjdisplay.py and fjresize.py in contrib section 475 - added fjclip.py, fjdisplay.py and fjresize.py in contrib section
474PizzaDude (https://github.com/pizzadude) 476PizzaDude (https://github.com/pizzadude)
diff --git a/README.md b/README.md
index e18d14267..ddeb4fd01 100644
--- a/README.md
+++ b/README.md
@@ -148,4 +148,4 @@ QMediathekView, aria2c, Authenticator, checkbashisms, devilspie, devilspie2, eas
148bsdcat, bsdcpio, bsdtar, lzmadec, lbunzip2, lbzcat, lbzip2, lzcat, lzcmp, lzdiff, lzegrep, lzfgrep, lzgrep, 148bsdcat, bsdcpio, bsdtar, lzmadec, lbunzip2, lbzcat, lbzip2, lzcat, lzcmp, lzdiff, lzegrep, lzfgrep, lzgrep,
149lzless, lzma, lzmainfo, lzmore, unlzma, unxz, xzcat, xzcmp, xzdiff, xzegrep, xzfgrep, xzgrep, xzless, xzmore, 149lzless, lzma, lzmainfo, lzmore, unlzma, unxz, xzcat, xzcmp, xzdiff, xzegrep, xzfgrep, xzgrep, xzless, xzmore,
150lzip, artha, nitroshare, nitroshare-cli, nitroshare-nmh, nirtoshare-send, nitroshare-ui, mencoder, gnome-pie, 150lzip, artha, nitroshare, nitroshare-cli, nitroshare-nmh, nirtoshare-send, nitroshare-ui, mencoder, gnome-pie,
151masterpdfeditor, QOwnNotes, aisleriot, Mendeley, feedreader, ocenaudio 151masterpdfeditor, QOwnNotes, aisleriot, Mendeley, feedreader, ocenaudio, mpsyt
diff --git a/RELNOTES b/RELNOTES
index 3b57ac694..1fa3be0c1 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -11,7 +11,7 @@ firejail (0.9.56.1) baseline; urgency=low
11 * new profiles: lzip, artha, nitroshare, nitroshare-cli, nitroshare-nmh 11 * new profiles: lzip, artha, nitroshare, nitroshare-cli, nitroshare-nmh
12 * new profiles: nirtoshare-send, nitroshare-ui, mencoder, gnome-pie 12 * new profiles: nirtoshare-send, nitroshare-ui, mencoder, gnome-pie
13 * new profiles: masterpdfeditor, QOwnNotes, aisleriot, Mendeley 13 * new profiles: masterpdfeditor, QOwnNotes, aisleriot, Mendeley
14 * new profiles: feedreader, ocenaudio 14 * new profiles: feedreader, ocenaudio, mpsyt
15 -- netblue30 <netblue30@yahoo.com> Thu, 11 Oct 2018 08:00:00 -0500 15 -- netblue30 <netblue30@yahoo.com> Thu, 11 Oct 2018 08:00:00 -0500
16 16
17firejail (0.9.56) baseline; urgency=low 17firejail (0.9.56) baseline; urgency=low