aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2019-02-16 12:53:22 -0600
committerLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2019-02-16 12:53:22 -0600
commita8056fcb810ed1c445b2bdb5df15607ad0ad9074 (patch)
treea5e658178011070d8458c14bb917449f4d8ee39a
parentRemove ipc-namespace from PR #2366 commits (diff)
downloadfirejail-a8056fcb810ed1c445b2bdb5df15607ad0ad9074.tar.gz
firejail-a8056fcb810ed1c445b2bdb5df15607ad0ad9074.tar.zst
firejail-a8056fcb810ed1c445b2bdb5df15607ad0ad9074.zip
merges
-rw-r--r--README2
-rw-r--r--README.md1
-rw-r--r--RELNOTES3
3 files changed, 6 insertions, 0 deletions
diff --git a/README b/README
index 50cf6e69f..0b720d24a 100644
--- a/README
+++ b/README
@@ -397,6 +397,8 @@ LaurentGH (https://github.com/LaurentGH)
397 - allow private-bin parameters to be absolute paths 397 - allow private-bin parameters to be absolute paths
398Loïc Damien (https://github.com/dzamlo) 398Loïc Damien (https://github.com/dzamlo)
399 - small fixes 399 - small fixes
400Lockdis (https://github.com/Lockdis)
401 - Added crow, nyx, and google-earth-pro profiles
400luzpaz (https://github.com/luzpaz) 402luzpaz (https://github.com/luzpaz)
401 - code spelling fixes 403 - code spelling fixes
402maces (https://github.com/maces) 404maces (https://github.com/maces)
diff --git a/README.md b/README.md
index 3867f8795..c8d1b63d2 100644
--- a/README.md
+++ b/README.md
@@ -102,3 +102,4 @@ We also keep a list of profile fixes for previous released versions in [etc-fixe
102## Current development version: 0.9.59 102## Current development version: 0.9.59
103 103
104## New profiles: 104## New profiles:
105crow, nyx
diff --git a/RELNOTES b/RELNOTES
index 3b36f25ad..4d0df7c89 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,6 @@
1firejail (0.9.58) baseline; urgency=low
2 * new profiles: crow, nyx
3
1firejail (0.9.58,2) baseline; urgency=low 4firejail (0.9.58,2) baseline; urgency=low
2 * cgroup flag in /etc/firejail/firejail.config file 5 * cgroup flag in /etc/firejail/firejail.config file
3 * name-change flag in /etc/firejail.config file 6 * name-change flag in /etc/firejail.config file