]> 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: e90e4af ef44c5f)
Merge branch 'master' into terencehill/italian_update
authorterencehill <piuntn@gmail.com>
Sat, 30 Apr 2011 18:39:44 +0000 (20:39 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 30 Apr 2011 18:39:44 +0000 (20:39 +0200)
1  2 
menu.dat.it.po patch | diff1 | diff2 | blob | history

diff --cc menu.dat.it.po
Simple merge