Permalink
Browse files

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

Conflicts:
	src/pylibemu.c
	src/pylibemu.pyx
  • Loading branch information...
2 parents 1ae9edf + 62d2270 commit 997599ff1714352a54ad964e063acb25860e3088 @rep committed May 4, 2012
Showing with 129 additions and 52 deletions.
  1. +1 −1 README
  2. +1 −1 setup.py
  3. +116 −42 src/pylibemu.c
  4. +1 −1 src/pylibemu.pxd
  5. +10 −7 src/pylibemu.pyx
View
2 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.
View
@@ -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",
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -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
Oops, something went wrong.

0 comments on commit 997599f

Please sign in to comment.