Skip to content

Commit

Permalink
Merge remote-tracking branch 'dfhack/master' into 0.40.08-r2
Browse files Browse the repository at this point in the history 
Conflicts:
	plugins/isoworld
  • Loading branch information
@expwnent
expwnent committed Aug 15, 2014
2 parents 5858b16 + 13bffed commit 74eee84
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion plugins/isoworld
Submodule isoworld updated 1 files
+13 −7 CMakeLists.txt

0 comments on commit 74eee84

Please sign in to comment.