diff options
| author | Legrandin <gooksankoo@hoiptorrow.mailexpire.com> | 2011-10-19 23:02:58 +0200 |
|---|---|---|
| committer | Legrandin <gooksankoo@hoiptorrow.mailexpire.com> | 2011-10-19 23:02:58 +0200 |
| commit | 8390495a9d7c574213fbff51af6f2aea249d81c7 (patch) | |
| tree | ebd647848d44f9ad152b1766a42f756c0b47638e /Doc | |
| parent | c22fa18c0dedb43a8b19dcb9b29512ba59e1764b (diff) | |
| download | pycrypto-8390495a9d7c574213fbff51af6f2aea249d81c7.tar.gz | |
Further fixed for python 3
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/epydoc-config | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Doc/epydoc-config b/Doc/epydoc-config index 6d59bb0..018e461 100644 --- a/Doc/epydoc-config +++ b/Doc/epydoc-config @@ -15,9 +15,6 @@ link: <a href="http://www.pycrypto.org/">PyCrypto.org</a> # The documentation is usually built on a Linux machine; nt.py tries to # import the winrandom module. -<<<<<<< HEAD +exclude-introspect: ^Crypto\.Random\.OSRNG\.nt|Crypto\.Util\.winrandom$ exclude-introspect: ^Crypto\.Util\.osentropy\.nt$ exclude: ^Crypto\.SelfTest -======= -exclude-introspect: ^Crypto\.Random\.OSRNG\.nt|Crypto\.Util\.winrandom$ ->>>>>>> b9658a26003ebfcfce1804a2363a29354799b47e |