summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Tad <tad@spotco.us>2018-10-13 13:19:04 -0400
committerLibravatar Tad <tad@spotco.us>2018-10-13 13:19:04 -0400
commitc6ec08bde3a10261827ac6defe78a8ec714e6461 (patch)
tree0d76695064dff97e53f28166c53ec9d1802970d2
parentMerge pull request #2182 from glitsj16/mencoder-take-2 (diff)
downloadfirejail-c6ec08bde3a10261827ac6defe78a8ec714e6461.tar.gz
firejail-c6ec08bde3a10261827ac6defe78a8ec714e6461.tar.zst
firejail-c6ec08bde3a10261827ac6defe78a8ec714e6461.zip
Merges
-rw-r--r--README5
-rw-r--r--README.md3
-rw-r--r--RELNOTES3
3 files changed, 8 insertions, 3 deletions
diff --git a/README b/README
index 7709de028..c122a006b 100644
--- a/README
+++ b/README
@@ -123,6 +123,8 @@ bn0785ac (https://github.com/bn0785ac)
123 - fix inox, add snox profile 123 - fix inox, add snox profile
124BogDan Vatra (https://github.com/bog-dan-ro) 124BogDan Vatra (https://github.com/bog-dan-ro)
125 - zoom profile 125 - zoom profile
126Brad Ackerman
127 - blacklist Bitwarden config in disable-passwdmgr.inc
126Bruno Nova (https://github.com/brunonova) 128Bruno Nova (https://github.com/brunonova)
127 - whitelist fix 129 - whitelist fix
128 - bash arguments fix 130 - bash arguments fix
@@ -282,7 +284,8 @@ glitsj16 (https://github.com/glitsj16)
282 - new profiles: lzless, lzma, lzmainfo, lzmore, unlzma, unxz, xzcat 284 - new profiles: lzless, lzma, lzmainfo, lzmore, unlzma, unxz, xzcat
283 - new profiles: xzcmp, xzdiff, xzegrep, xzfgrep, xzgrep, xzless, xzmore 285 - new profiles: xzcmp, xzdiff, xzegrep, xzfgrep, xzgrep, xzless, xzmore
284 - new profiles: lzip, artha, nitroshare, nitroshare-cli, nitroshare-nmh 286 - new profiles: lzip, artha, nitroshare, nitroshare-cli, nitroshare-nmh
285 - new profiles: nirtoshare-send, nitroshare-ui 287 - new profiles: nirtoshare-send, nitroshare-ui, mencoder, gnome-pie
288 - new profiles: masterpdfeditor
286graywolf (https://github.com/graywolf) 289graywolf (https://github.com/graywolf)
287 - spelling fix 290 - spelling fix
288greigdp (https://github.com/greigdp) 291greigdp (https://github.com/greigdp)
diff --git a/README.md b/README.md
index f0fcec6db..8ce9a84fa 100644
--- a/README.md
+++ b/README.md
@@ -136,5 +136,6 @@ The new LTS branch is here: https://github.com/netblue30/firejail/tree/LTSbase
136QMediathekView, aria2c, Authenticator, checkbashisms, devilspie, devilspie2, easystroke, github-desktop, min, 136QMediathekView, aria2c, Authenticator, checkbashisms, devilspie, devilspie2, easystroke, github-desktop, min,
137bsdcat, bsdcpio, bsdtar, lzmadec, lbunzip2, lbzcat, lbzip2, lzcat, lzcmp, lzdiff, lzegrep, lzfgrep, lzgrep, 137bsdcat, bsdcpio, bsdtar, lzmadec, lbunzip2, lbzcat, lbzip2, lzcat, lzcmp, lzdiff, lzegrep, lzfgrep, lzgrep,
138lzless, lzma, lzmainfo, lzmore, unlzma, unxz, xzcat, xzcmp, xzdiff, xzegrep, xzfgrep, xzgrep, xzless, xzmore, 138lzless, lzma, lzmainfo, lzmore, unlzma, unxz, xzcat, xzcmp, xzdiff, xzegrep, xzfgrep, xzgrep, xzless, xzmore,
139lzip, artha, nitroshare, nitroshare-cli, nitroshare-nmh, nirtoshare-send, nitroshare-ui 139lzip, artha, nitroshare, nitroshare-cli, nitroshare-nmh, nirtoshare-send, nitroshare-ui, mencoder, gnome-pie,
140masterpdfeditor
140 141
diff --git a/RELNOTES b/RELNOTES
index 67a03be10..85f0c2b7a 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -8,7 +8,8 @@ firejail (0.9.56.1) baseline; urgency=low
8 * new profiles: lzless, lzma, lzmainfo, lzmore, unlzma, unxz, xzcat 8 * new profiles: lzless, lzma, lzmainfo, lzmore, unlzma, unxz, xzcat
9 * new profiles: xzcmp, xzdiff, xzegrep, xzfgrep, xzgrep, xzless, xzmore 9 * new profiles: xzcmp, xzdiff, xzegrep, xzfgrep, xzgrep, xzless, xzmore
10 * new profiles: lzip, artha, nitroshare, nitroshare-cli, nitroshare-nmh 10 * new profiles: lzip, artha, nitroshare, nitroshare-cli, nitroshare-nmh
11 * new profiles: nirtoshare-send, nitroshare-ui 11 * new profiles: nirtoshare-send, nitroshare-ui, mencoder, gnome-pie
12 * new profiles: masterpdfeditor
12 -- netblue30 <netblue30@yahoo.com> Thu, 11 Oct 2018 08:00:00 -0500 13 -- netblue30 <netblue30@yahoo.com> Thu, 11 Oct 2018 08:00:00 -0500
13 14
14firejail (0.9.56) baseline; urgency=low 15firejail (0.9.56) baseline; urgency=low