Merge branch 'development'

Open-Turing-Project · Dec 7, 2011 · 1a07794 · 1a07794
2 parents 337655f + de3f167
commit 1a07794
Show file tree

Hide file tree

Showing 33 changed files with 19 additions and 4,553 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,3 +1,7 @@
+The Open Turing Project License
+
+Open Turing is released under the MIT license unless otherwise specified by a license file, readme file or code comments. Some (not all) of the things not covered by this license: libungif, the JPEG library, java-related code in the ready/src directory and Microsoft code in the support/Microsoft directory of the package.
+
 MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

diff --git a/Readme.md b/Readme.md
@@ -81,4 +81,8 @@ To get a fully working release with your changes you must compile both of these.
 
 ###How Can I Help?
 
-Look in the issues tab. Either fix things or add new features listed there.
+Look in the issues tab. Either fix things or add new features listed there.
+
+###Legal
+
+Open Turing uses the IGL JPEG Library and the libungif library.
diff --git a/local/README.txt b/local/README.txt
diff --git a/local/cvstat.bat b/local/cvstat.bat
diff --git a/local/evim.bat b/local/evim.bat
diff --git a/local/gutils.dll b/local/gutils.dll
diff --git a/local/gvim.bat b/local/gvim.bat
diff --git a/local/mydoc.bat b/local/mydoc.bat
diff --git a/local/ued.bat b/local/ued.bat
diff --git a/local/ufind.bat b/local/ufind.bat
diff --git a/local/vi.bat b/local/vi.bat
diff --git a/local/vim.bat b/local/vim.bat
diff --git a/local/windiff.GID b/local/windiff.GID
diff --git a/local/windiff.exe b/local/windiff.exe
diff --git a/local/windiff.hlp b/local/windiff.hlp