]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b2e16e 797664d)
Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Tue, 3 Jan 2012 12:02:44 +0000 (13:02 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 3 Jan 2012 12:02:44 +0000 (13:02 +0100)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge