pimhwang/qTox - qTox - git.quantfans.net

Author	SHA1	Message	Date
Anthony Bilinski	fe9d83d881	chore(tools): allow merging PR to whatever branch is checked out Useful for either dev testing or merging PRs to dev branches. Also stop updating local repo state beyond merging the PR.	6 years ago
Zetok Zalbavar	63e95f3528	chore(build): adjust version updating script to not rely on git Relying on git doesn't work in awful lot of cases, e.g. when there's a shallow `git clone`. Instead have "hardcoded" version in files, and update it before release. Closes #4165.	9 years ago
Zetok Zalbavar	c717f128da	chore: add current version in OSX's .plist file(s) with a script Also add a script to update both osx and windows versions.	9 years ago
Zetok Zalbavar	8f37d4c7ab	chore: delete leftover branches from previous testing with test script	9 years ago
initramfs	b7aa982a57	chore: rewrite all links to the qTox repository from tux3 to qTox	9 years ago
Zetok Zalbavar	2a420b85ef	chore(test-pr.sh): commit merge as `qTox testing <>` With this one doesn't need to even have git properly configured to test a PR.	9 years ago
Zetok Zalbavar	99ce719b80	chore: remove unnecessary indentation from merge commit message	9 years ago
Zetok Zalbavar	784d42d8d7	chore(test-pr.sh): add test-pr.sh script as requested Add missing copyright stuff to `merge-pr.sh`. Refactored & split `merge-pr.sh` script, since most of required code for `test-pr.sh` already existed there. Differences from `merge-pr.sh`: * if there's no `upstream` remote, https version is used instead of git * merge commit is not GPG-signed (less hassle) * merge branch is named e.g. `test1234` instead of `merge1234` * instructions for pushing test branch onto upstream master are not printed	9 years ago