]> de.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: c091c11 87bcf91)
Merge branch 'master' into terencehill/color_picker_carets
authorterencehill <piuntn@gmail.com>
Sun, 13 Nov 2011 18:01:48 +0000 (19:01 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 13 Nov 2011 18:01:48 +0000 (19:01 +0100)

Trivial merge