mirror of
https://github.com/FeralInteractive/gamemode.git
synced 2025-06-06 15:47:20 +02:00
Fix incorrect merge conflict resolution.
This commit is contained in:
parent
d27f8caecc
commit
39f93e4000
@ -5,9 +5,8 @@ set -e
|
|||||||
# gamemode tree, including the subprojects, so that it can be trivially
|
# gamemode tree, including the subprojects, so that it can be trivially
|
||||||
# packaged by distributions banning networking during build.
|
# packaged by distributions banning networking during build.
|
||||||
|
|
||||||
# Bump in tandem with meson.build, run script once new tag is up.
|
|
||||||
VERSION="1.6-dev"
|
|
||||||
NAME="gamemode"
|
NAME="gamemode"
|
||||||
|
VERSION=$(git describe --tags --dirty)
|
||||||
|
|
||||||
# get code in this repo
|
# get code in this repo
|
||||||
git archive HEAD --format=tar --prefix=${NAME}-${VERSION}/ --output=${NAME}-${VERSION}.tar
|
git archive HEAD --format=tar --prefix=${NAME}-${VERSION}/ --output=${NAME}-${VERSION}.tar
|
||||||
|
Loading…
x
Reference in New Issue
Block a user