]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 890c0a8 0a640da)
Merge remote-tracking branch 'origin/mrbougo/tooltips_fix'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 1 Mar 2011 17:50:50 +0000 (18:50 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 1 Mar 2011 17:50:50 +0000 (18:50 +0100)
1  2 
tooltips.db patch | diff1 | diff2 | blob | history

diff --cc tooltips.db
Simple merge