aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown/Pkgconfig-module.md
diff options
context:
space:
mode:
Diffstat (limited to 'docs/markdown/Pkgconfig-module.md')
-rw-r--r--docs/markdown/Pkgconfig-module.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/markdown/Pkgconfig-module.md b/docs/markdown/Pkgconfig-module.md
index 13fc4e6..2497fd9 100644
--- a/docs/markdown/Pkgconfig-module.md
+++ b/docs/markdown/Pkgconfig-module.md
@@ -58,6 +58,7 @@ keyword arguments.
generating the uninstalled pkg-config file. Since *0.54.0*
- `dataonly` field. (*since 0.54.0*) this is used for architecture-independent
pkg-config files in projects which also have architecture-dependent outputs.
+- `conflicts` (*since 0.36.0, incorrectly issued a warning prior to 0.54.0*) list of strings to be put in the `Conflicts` field.
Since 0.46 a `StaticLibrary` or `SharedLibrary` object can optionally be passed
as first positional argument. If one is provided a default value will be