aboutsummaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2017-05-18 10:06:05 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2017-05-18 10:06:05 -0400
commit3c2c0c08fdc2cc15d4f41bb513890245a39330eb (patch)
tree856d20190e09196f17974d6e60b884e419c064f2 /README
parentMerge pull request #1270 from SYN-cook/patch-1 (diff)
downloadfirejail-3c2c0c08fdc2cc15d4f41bb513890245a39330eb.tar.gz
firejail-3c2c0c08fdc2cc15d4f41bb513890245a39330eb.tar.zst
firejail-3c2c0c08fdc2cc15d4f41bb513890245a39330eb.zip
merges
Diffstat (limited to 'README')
-rw-r--r--README4
1 files changed, 3 insertions, 1 deletions
diff --git a/README b/README
index e45c6d412..f40ad2dbb 100644
--- a/README
+++ b/README
@@ -35,7 +35,7 @@ Maintainer:
35Committers 35Committers
36- Fred-Barclay (https://github.com/Fred-Barclay) 36- Fred-Barclay (https://github.com/Fred-Barclay)
37- Reiner Herrmann (https://github.com/reinerh) 37- Reiner Herrmann (https://github.com/reinerh)
38- startx2017 (https://github.com/startx2017) - 0.9.38-LTS branch maintainer 38- startx2017 (https://github.com/startx2017) - 0.9.38-LTS and *bugfixes branches maintainer
39- netblue30 (netblue30@yahoo.com) 39- netblue30 (netblue30@yahoo.com)
40 40
41 41
@@ -132,6 +132,7 @@ dshmgh (https://github.com/dshmgh)
132Duncan Overbruck (https://github.com/Duncaen) 132Duncan Overbruck (https://github.com/Duncaen)
133 - musl libc fix 133 - musl libc fix
134 - utmp fix 134 - utmp fix
135 - fix install for --disable-seccomp software configurations
135emacsomancer (https://github.com/emacsomancer) 136emacsomancer (https://github.com/emacsomancer)
136 - added profile for Conkeror browser 137 - added profile for Conkeror browser
137eventyrer (https://github.com/eventyrer) 138eventyrer (https://github.com/eventyrer)
@@ -384,6 +385,7 @@ SYN-cook (https://github.com/SYN-cook)
384 - cleaned up Okular and Gwenview profiles 385 - cleaned up Okular and Gwenview profiles
385 - added baloo_file profile 386 - added baloo_file profile
386 - k3b profile update 387 - k3b profile update
388 - noexec changes
387startx2017 (https://github.com/startx2017) 389startx2017 (https://github.com/startx2017)
388 - syscall list update 390 - syscall list update
389 - updated default seccomp filters - added bpf, clock_settime, personality, process_vm_writev, query_module, 391 - updated default seccomp filters - added bpf, clock_settime, personality, process_vm_writev, query_module,