Nicer merging.
authorRudolf Polzer <divverent@xonotic.org>
Fri, 13 Sep 2013 09:22:42 +0000 (11:22 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 13 Sep 2013 09:22:42 +0000 (11:22 +0200)
commit72226cf8ee17c96e430e57e95bc56f787a80c517
tree2e62823a3d6540b912048462b0addf8a909b56da
parentfb9a89e4cbc02dd50814972bb1c329908dc127a0
Nicer merging.
.tx/merge-base
tx.sh