Merge branch 'pr_documents_koch' of git://github.com/gradha/Nimrod into gradha-pr_documents_koch

Conflicts:
	web/nimrod.ini
This commit is contained in:
Clay Sweetser 2014-05-31 14:41:34 -04:00
commit 24e6baa3e2
7 changed files with 166 additions and 7 deletions

View file

@ -6,6 +6,8 @@
# See the file "copying.txt", included in this
# distribution, for details about the copyright.
#
# See doc/koch.txt for documentation.
#
when defined(gcc) and defined(windows):
when defined(x86):