Merge branch 'IsoRemote' of github.com:JapaMala/dfhack into IsoRemote

Browse Source

Conflicts:
	plugins/CMakeLists.txt
	plugins/isoworldremote.cpp

develop

Japa 2013-03-30 13:03:22 +05:30

parent 14369d18dc 6e9de245c2

commit 9981d21965

2 changed files with 386 additions and 386 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files