aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2017-08-13 09:53:49 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2017-08-13 09:53:49 -0400
commit28e5585dc3d6b74851cd23b6f729ff7004e46d49 (patch)
treeba0666fdfc1454a5e1ad3e52807159bcf288e3f7
parentMerge pull request #1465 from pizzadude/patch-1 (diff)
downloadfirejail-28e5585dc3d6b74851cd23b6f729ff7004e46d49.tar.gz
firejail-28e5585dc3d6b74851cd23b6f729ff7004e46d49.tar.zst
firejail-28e5585dc3d6b74851cd23b6f729ff7004e46d49.zip
merges
-rw-r--r--README2
-rw-r--r--RELNOTES2
2 files changed, 3 insertions, 1 deletions
diff --git a/README b/README
index fefdedd94..f2dc9ec91 100644
--- a/README
+++ b/README
@@ -336,6 +336,8 @@ pirate486743186 (https://github.com/pirate486743186)
336 - KMail profile 336 - KMail profile
337Pixel Fairy (https://github.com/xahare) 337Pixel Fairy (https://github.com/xahare)
338 - added fjclip.py, fjdisplay.py and fjresize.py in contrib section 338 - added fjclip.py, fjdisplay.py and fjresize.py in contrib section
339PizzaDude (https://github.com/pizzadude)
340 - add mpv support to smplayer
339pshpsh (https://github.com/pshpsh) 341pshpsh (https://github.com/pshpsh)
340 - added FossaMail profile 342 - added FossaMail profile
341pstn (https://github.com/pstn) 343pstn (https://github.com/pstn)
diff --git a/RELNOTES b/RELNOTES
index 8b29b734a..25cacb281 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,6 @@
1firejail (0.9.49) baseline; urgency=low 1firejail (0.9.49) baseline; urgency=low
2 * work in progress! 2 * work in progress!
3 * modif: --output split in two commands: --output and --output-stderr 3 * modif: --output split in two commands, --output and --output-stderr
4 * feature: per-profile disable-mnt (--disable-mnt) 4 * feature: per-profile disable-mnt (--disable-mnt)
5 * feature: per-profile support to set X11 Xephyr screen size (--xephyr-screen) 5 * feature: per-profile support to set X11 Xephyr screen size (--xephyr-screen)
6 * enhancement: /proc/sys mounting 6 * enhancement: /proc/sys mounting