Merge remote-tracking branch 'origin/terencehill/clear_button'
authorSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 00:37:05 +0000 (20:37 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 00:37:05 +0000 (20:37 -0400)
commit35e620eefaa42e08f2f61d20b39132e39e58d476
tree8832ae25f3bb60173609921577e5e5ee9e5f6b71
parentc4642928dead2ea338554f1db1a3024809d01272
parent2be39968eee26eaafc1099e9d72ccb2066b8414e
Merge remote-tracking branch 'origin/terencehill/clear_button'