]> git.xonotic.org Git - xonotic/xonotic.git/commit
for DP repo: support separate master branches
authorRudolf Polzer <divverent@alientrap.org>
Mon, 14 May 2012 18:41:48 +0000 (20:41 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 14 May 2012 18:41:48 +0000 (20:41 +0200)
commit5801f18dd046d9914bcf5d8308e1e2687fe091bb
tree94036828df527c44efe4d2f8937ae4521a429552
parentd5adeaa2976c1d30239584f7a731d580d52d930e
for DP repo: support separate master branches
misc/tools/conflict-watch.sh