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

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

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

author	Mirio <opivy@hotmail.de>
	Fri, 11 Sep 2015 18:06:23 +0000 (20:06 +0200)
committer	Mirio <opivy@hotmail.de>
	Fri, 11 Sep 2015 18:06:23 +0000 (20:06 +0200)
commit	494e2b60664186b624f9db860c5603ba75fd94d4
tree	6e405646079cbfcf837aea895f13a7e6a6400014	tree \| snapshot
parent	22231a013f177395c8a73ad42495179f7b483fad	commit \| diff

conflict pliz

113 files changed:

maps/_hudsetup.jpg		diff \| blob \| history
maps/_hudsetup.map		diff \| blob \| history
maps/_hudsetup.map.options		diff \| blob \| history
maps/afterslime.jpg		diff \| blob \| history
maps/afterslime.map		diff \| blob \| history
maps/afterslime.map.options		diff \| blob \| history
maps/atelier.jpg		diff \| blob \| history
maps/atelier.map		diff \| blob \| history
maps/atelier.map.options		diff \| blob \| history
maps/catharsis.jpg		diff \| blob \| history
maps/catharsis.map		diff \| blob \| history
maps/catharsis.map.options		diff \| blob \| history
maps/courtfun.jpg		diff \| blob \| history
maps/courtfun.map		diff \| blob \| history
maps/courtfun.map.options		diff \| blob \| history
maps/dance.jpg		diff \| blob \| history
maps/dance.map		diff \| blob \| history
maps/dance.map.options		diff \| blob \| history
maps/darkzone.jpg		diff \| blob \| history
maps/darkzone.map		diff \| blob \| history
maps/darkzone.map.options		diff \| blob \| history
maps/drain.jpg		diff \| blob \| history
maps/drain.map		diff \| blob \| history
maps/drain.map.options		diff \| blob \| history
maps/finalrage.jpg		diff \| blob \| history
maps/finalrage.map		diff \| blob \| history
maps/finalrage.map.options		diff \| blob \| history
maps/fuse.jpg		diff \| blob \| history
maps/fuse.map		diff \| blob \| history
maps/fuse.map.options		diff \| blob \| history
maps/g-23.jpg		diff \| blob \| history
maps/g-23.map		diff \| blob \| history
maps/g-23.map.options		diff \| blob \| history
maps/g-23.mapinfo		diff \| blob \| history
maps/glowplant.jpg		diff \| blob \| history
maps/glowplant.map		diff \| blob \| history
maps/glowplant.map.options		diff \| blob \| history
maps/implosion.jpg		diff \| blob \| history
maps/implosion.map		diff \| blob \| history
maps/implosion.map.options		diff \| blob \| history
maps/implosion.mapinfo		diff \| blob \| history
maps/leave_em_behind.jpg		diff \| blob \| history
maps/leave_em_behind.map		diff \| blob \| history
maps/leave_em_behind.map.options		diff \| blob \| history
maps/nexballarena.jpg		diff \| blob \| history
maps/nexballarena.map		diff \| blob \| history
maps/nexballarena.map.options		diff \| blob \| history
maps/oilrig.jpg		diff \| blob \| history
maps/oilrig.map		diff \| blob \| history
maps/oilrig.map.options		diff \| blob \| history
maps/runningman.jpg		diff \| blob \| history
maps/runningman.map		diff \| blob \| history
maps/runningman.map.options		diff \| blob \| history
maps/runningmanctf.jpg		diff \| blob \| history
maps/runningmanctf.map		diff \| blob \| history
maps/runningmanctf.map.options		diff \| blob \| history
maps/runningmanctf.mapinfo		diff \| blob \| history
maps/silentsiege.jpg		diff \| blob \| history
maps/silentsiege.map		diff \| blob \| history
maps/silentsiege.map.options		diff \| blob \| history
maps/solarium.jpg		diff \| blob \| history
maps/solarium.map		diff \| blob \| history
maps/solarium.map.options		diff \| blob \| history
maps/space-elevator.jpg		diff \| blob \| history
maps/space-elevator.map		diff \| blob \| history
maps/space-elevator.map.options		diff \| blob \| history
maps/stormkeep.jpg		diff \| blob \| history
maps/stormkeep.map		diff \| blob \| history
maps/stormkeep.map.options		diff \| blob \| history
maps/techassault.jpg		diff \| blob \| history
maps/techassault.map		diff \| blob \| history
maps/techassault.map.options		diff \| blob \| history
maps/vorix.jpg		diff \| blob \| history
maps/vorix.map		diff \| blob \| history
maps/vorix.map.options		diff \| blob \| history
maps/warfare.jpg		diff \| blob \| history
maps/warfare.map		diff \| blob \| history
maps/warfare.map.options		diff \| blob \| history
maps/xoylent.jpg		diff \| blob \| history
maps/xoylent.map		diff \| blob \| history
maps/xoylent.map.options		diff \| blob \| history
scripts/exx.shader		diff \| blob \| history
scripts/map_catharsis.shader		diff \| blob \| history
scripts/map_space-elevator.shader		diff \| blob \| history
scripts/modify_lights.sh	[new file with mode: 0755]	blob
scripts/shaderlist.txt		diff \| blob \| history
scripts/trak5x.shader		diff \| blob \| history
textures/map_catharsis/50_armor.jpg	[new file with mode: 0644]	blob
textures/map_catharsis/base2_decal.jpg	[new file with mode: 0644]	blob
textures/map_catharsis/base_decal.jpg	[new file with mode: 0644]	blob
textures/map_catharsis/by_justin.jpg	[new file with mode: 0644]	blob
textures/map_catharsis/catharsis_decal.jpg	[new file with mode: 0644]	blob
textures/map_catharsis/chain.jpg	[new file with mode: 0644]	blob
textures/map_catharsis/chain_alpha.jpg	[new file with mode: 0644]	blob
textures/map_catharsis/crylink.jpg	[new file with mode: 0644]	blob
textures/map_catharsis/red.jpg	[new file with mode: 0644]	blob
textures/map_catharsis/red_glow.jpg	[new file with mode: 0644]	blob
textures/map_catharsis/samual_easter.jpg	[new file with mode: 0644]	blob
textures/map_catharsis/spawn_decal.jpg	[new file with mode: 0644]	blob
textures/map_catharsis/spawn_decal_01.jpg	[new file with mode: 0644]	blob
textures/map_sacred/50_armor.jpg	[deleted file]	blob \| history
textures/map_sacred/base2_decal.jpg	[deleted file]	blob \| history
textures/map_sacred/base_decal.jpg	[deleted file]	blob \| history
textures/map_sacred/by_justin.jpg	[deleted file]	blob \| history
textures/map_sacred/catharsis_decal.jpg	[deleted file]	blob \| history
textures/map_sacred/chain.jpg	[deleted file]	blob \| history
textures/map_sacred/chain_alpha.jpg	[deleted file]	blob \| history
textures/map_sacred/crylink.jpg	[deleted file]	blob \| history
textures/map_sacred/red.jpg	[deleted file]	blob \| history
textures/map_sacred/red_glow.jpg	[deleted file]	blob \| history
textures/map_sacred/samual_easter.jpg	[deleted file]	blob \| history
textures/map_sacred/spawn_decal.jpg	[deleted file]	blob \| history
textures/map_sacred/spawn_decal_01.jpg	[deleted file]	blob \| history

RSS Atom