Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bstable'

Browse Source
This commit is contained in:
ccd0 2016-04-28 00:49:46 -07:00
commit dcf726ade6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -330,7 +330,7 @@ $(foreach i,1 2 3 4,bump$(i)) : cleanrel
beta : distready beta : distready
git tag -af beta -m "$(meta_name) v$(version)." git tag -af beta -m "$(meta_name) v$(version)."
cd dist && git merge --no-commit -s ours beta cd dist && git merge --no-commit -s ours beta
cd dist && git checkout beta "builds/*-beta.*" LICENSE CHANGELOG.md img .gitignore .gitattributes cd dist && git checkout beta "builds/*-beta.*" img .gitignore .gitattributes
cd dist && git commit -am "Move $(meta_name) v$(version) to beta channel." cd dist && git commit -am "Move $(meta_name) v$(version) to beta channel."
stable : distready stable : distready