epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'matt/dune^'

Browse Source 
Conflicts:
	.gitignore
	mods/d2k/rules/system.yaml
This commit is contained in:
Chris Forbes
2012-06-25 09:05:49 +12:00
parent 2ed12f1d95 7220025a62
commit a2b92d0fe4
31 changed files with 585 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -55,3 +55,4 @@ OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
*.config
*.resources
*.kate-swp