]> git.rm.cloudns.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6de66b6 5958687)
Merge remote-tracking branch 'origin/graphitemaster/cooking' into divVerent/vector...
authorRudolf Polzer <divverent@xonotic.org>
Mon, 26 Aug 2013 09:09:32 +0000 (11:09 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 26 Aug 2013 09:09:32 +0000 (11:09 +0200)
1  2 
ir.c patch | diff1 | diff2 | blob | history

diff --cc ir.c
Simple merge