]> 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: ee19dbc 6fbc1f6)
Merge branch 'master' into des/racetimer_speed
authorDes <xon@damianv.com.ar>
Fri, 29 Nov 2024 12:39:08 +0000 (09:39 -0300)
committerDes <xon@damianv.com.ar>
Fri, 29 Nov 2024 12:39:08 +0000 (09:39 -0300)
1  2 
qcsrc/client/hud/panel/racetimer.qc patch | diff1 | diff2 | blob | history
qcsrc/client/hud/panel/racetimer.qh patch | diff1 | diff2 | blob | history
qcsrc/client/main.qh patch | diff1 | diff2 | blob | history
xonotic-client.cfg patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud/panel/racetimer.qc
Simple merge
diff --cc qcsrc/client/hud/panel/racetimer.qh
Simple merge
diff --cc qcsrc/client/main.qh
Simple merge
diff --cc xonotic-client.cfg
Simple merge