Merge branch 'master' into development

This commit is contained in:
Cagebreak Signing Key 1 2020-02-22 17:06:02 +00:00
commit 540212aa18

View file

@ -100,6 +100,7 @@ else
have_xwayland = false
endif
version = '@0@'.format(meson.project_version())
git = find_program('git', native: true, required: false)
if git.found()
git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'])
@ -111,8 +112,6 @@ if git.found()
git_branch.stdout().strip(),
)
endif
else
version = '@0@'.format(meson.project_version())
endif
conf_data = configuration_data()