Chris Forbes a2b92d0fe4 Merge commit 'matt/dune^' ...

Conflicts:
	.gitignore
	mods/d2k/rules/system.yaml

2012-06-25 09:05:49 +12:00

..

aircraft.yaml

fix passable edges in Cliff terrain tiles

2012-06-16 21:19:46 +02:00

atreides.yaml

replaced RA sounds by Dune 2000 ones

2012-06-23 16:00:20 +02:00

defaults.yaml

replaced RA sounds by Dune 2000 ones

2012-06-23 16:00:20 +02:00

harkonnen.yaml

race specific ProductionQueue audio

2012-06-20 23:40:08 +02:00

infantry.yaml

race specific ProductionQueue audio

2012-06-20 23:40:08 +02:00

ordos.yaml

race specific ProductionQueue audio

2012-06-20 23:40:08 +02:00

structures.yaml

replaced RA sounds by Dune 2000 ones

2012-06-23 16:00:20 +02:00

system.yaml

Merge commit 'matt/dune^'

2012-06-25 09:05:49 +12:00

vehicles.yaml

race specific ProductionQueue audio

2012-06-20 23:40:08 +02:00