Merge branch 'master' of git://github.com/buffer/pylibemu

Conflicts: src/pylibemu.c src/pylibemu.pyx
rep · May 4, 2012 · 997599f · 997599f
2 parents 1ae9edf + 62d2270
commit 997599f
Show file tree

Hide file tree

Showing 5 changed files with 129 additions and 52 deletions.
diff --git a/README b/README
@@ -167,7 +167,7 @@ method and subsequently run the shellcode emulation test again as shown above.
 License information
 ===================
 
-Copyright (C) 2011 Angelo Dell'Aera <buffer@antifork.org>
+Copyright (C) 2011-2012 Angelo Dell'Aera <buffer@antifork.org>
 
 License: GNU General Public License, version 2 or later; see COPYING.txt
          included in this archive for details.

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 setup(
     name         = "pylibemu",
     packages     = [],
-    version      = "0.1.4",
+    version      = "0.1.5",
     description  = "Libemu Python wrapper",
     url          = "",
     author       = "Angelo Dell'Aera",

diff --git a/src/pylibemu.c b/src/pylibemu.c
diff --git a/src/pylibemu.pxd b/src/pylibemu.pxd
@@ -1,6 +1,6 @@
 # pylibemu.pxd
 #
-# Copyright(c) 2011 Angelo Dell'Aera <buffer@antifork.org>
+# Copyright(c) 2011-2012 Angelo Dell'Aera <buffer@antifork.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as