Change license to MIT

You are free to use this code under the terms of the MIT license.

While at it, include my public e-mail address and remove trailing white
space.

1 files changed, 6 insertions, 11 deletions

diff --git a/Asm.py b/Asm.py
index 018b4de..55baab1 100644
--- a/Asm.py
+++ b/Asm.py
@@ -1,22 +1,17 @@
 #!/usr/bin/env python
 """Compiles C into assembly for the practicum processor (PP2)
 
-All rights reserved, you may not redistribute or use this program without prior
-permission from Peter Wu or Xander Houtman. Use of this program is entirely
-your own risk. In no circumstances can the authors of this program be held
-responsible for any damage including, but not limited to, financial damage or
-data loss. Modification of this program is not allowed without prior
-permission. The generated output (assembly and messages) are not subject to
-this license.
+Copyright (C) 2011-2014 Peter Wu <lekensteyn@gmail.com>
+Licensed under the MIT license <http://opensource.org/licenses/MIT>.
 """
 
 __author__ = "Peter Wu"
-__copyright__ = "Copyright 2011, Peter Wu"
+__copyright__ = "Copyright (C) 2011-2014 Peter Wu"
 __credits__ = ["Peter Wu"]
-__license__ = "Proprietary"
+__license__ = "MIT"
 __version__ = "1.0"
 __maintainer__ = "Peter Wu"
-__email__ = "uwretep@gmail.com"
+__email__ = "lekensteyn@gmail.com"
 
 import re
 
@@ -87,7 +82,7 @@ class Asm(object):
         return label[0].strip(": ")
     def noop(self, label, register="R0"):
         """Returns a labelled no operation operator
-        
+
         Note that the Zero, Negative and oVerflow flags are modified
         """
         return self.binary_op("LOAD", register, register, label) + " ; NOOP"