3 Commits

Author	SHA1	Message	Date
sudden6	8d320ca3be	chore: Make building for FreeBSD easier ... Add some patches from https://svnweb.freebsd.org/ports/head/net-im/qTox/ and make some things more platform independent.	2016-12-28 22:15:16 +01:00
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.	2016-07-13 20:50:40 +01:00
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	2016-06-19 10:22:02 +01:00