git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

projects / xonotic / xonotic-data.pk3dir.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 64f396f 3f9820e)

author	Mario <mario.mario@y7mail.com>
	Mon, 9 Dec 2024 03:36:48 +0000 (13:36 +1000)
committer	Mario <mario.mario@y7mail.com>
	Mon, 9 Dec 2024 03:36:48 +0000 (13:36 +1000)
commit	0990ba01b3a4751c8e6955705906b7e036c37aa5
tree	8e169ea96f4c92472e00f819fc492712e25d648c	tree \| snapshot
parent	64f396f302abd416fabbeffa5a001b8c0d2d25b5	commit \| diff
parent	3f9820ed585f880602172c75048f076034af77aa	commit \| diff

Merge branch 'master' into Mario/shockwave_removal

.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
bal-wep-mario.cfg	diff1 \|	diff2 \|	blob \| history
bal-wep-nexuiz25.cfg	diff1 \|	diff2 \|	blob \| history
bal-wep-samual.cfg	diff1 \|	diff2 \|	blob \| history
bal-wep-xdf.cfg	diff1 \|	diff2 \|	blob \| history
bal-wep-xonotic.cfg	diff1 \|	diff2 \|	blob \| history
xonotic-client.cfg	diff1 \|	diff2 \|	blob \| history