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

author	Rudolf Polzer <divverent@xonotic.org>
	Sat, 3 Dec 2011 11:46:44 +0000 (12:46 +0100)
committer	Rudolf Polzer <divverent@xonotic.org>
	Sat, 3 Dec 2011 11:46:44 +0000 (12:46 +0100)
commit	9cc92087f4f6f4aa514f8b8919fda37b710057b0
tree	bd24817b868d59771e92f32baf5076f72a7724fb	tree \| snapshot
parent	69a2e2ba0845a286b764e71fc5956b71a155ca61	commit \| diff

Squashed commit of the following:

commit 1c957af5b9748c46d92a4fa3da93d2c1a19ba778
Merge: a4ae0be 69a2e2b
Author: Samual <samual@xonotic.org>
Date:   Fri Dec 2 15:17:19 2011 -0500

    Merge remote branch 'origin/master' into morphed/minstanex

commit a4ae0be7220424ea0c8d7621b815cc482b18d828
Merge: ebe8eee 0396c95
Author: Samual <samual@xonotic.org>
Date:   Fri Dec 2 02:28:35 2011 -0500

    Merge remote branch 'origin/master' into morphed/minstanex

commit ebe8eee72691e07c3731e4c88f25de4a751a5339
Author: Morphed <morphed@o2.pl>
Date:   Thu Dec 1 23:09:59 2011 +0100

    stupid git !!! forgot models

commit d1bb9dd137bd9ec9372b08776c88c8dfd91de39d
Author: Morphed <morphed@o2.pl>
Date:   Thu Dec 1 22:40:13 2011 +0100

    minstanex by LJFHutch/theShadow #woxblox#

models/weapons/g_minstanex.md3		diff \| blob \| history
models/weapons/h_minstanex.iqm		diff \| blob \| history
models/weapons/h_minstanex.iqm.framegroups		diff \| blob \| history
models/weapons/mnex.tga	[new file with mode: 0644]	blob
models/weapons/mnex_bump.tga	[new file with mode: 0644]	blob
models/weapons/mnex_gloss.tga	[new file with mode: 0644]	blob
models/weapons/mnex_glow.tga	[new file with mode: 0644]	blob
models/weapons/mnex_reflect.tga	[new file with mode: 0644]	blob
models/weapons/mnex_shirt.tga	[new file with mode: 0644]	blob
models/weapons/v_minstanex.md3		diff \| blob \| history
scripts/mnex.shader	[new file with mode: 0644]	blob