RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-02-02 03:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

oops :)

Browse Source
This commit is contained in:
Rudolf Polzer 2012-05-14 20:47:47 +02:00
parent c91f8f79dd
commit 7ee94f1dfb
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
misc/tools/conflict-watch.sh
View File

@ -158,8 +158,7 @@ case "$action" in
xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant-split-up-the-q3map2-commit) continue ;;
xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant-split-up-the-q3map2-commit-goal) continue ;;
xonotic/fteqcc.git:refs/remotes/origin/wip) continue ;;
xonotic/darkplaces:refs/remotes/origin/master) continue ;;
xonotic/darkplaces:refs/remotes/origin/dp-mqc-render) continue ;;
xonotic/darkplaces.git:refs/remotes/origin/dp-mqc-render) continue ;;
esac
if [ x"$masterhash" = x"$masterhash2" ]; then