Merge remote-tracking branch 'origin/master'

sfneal · Aug 16, 2018 · e4ad9d1 · e4ad9d1
2 parents ac8820a + 4a0f308
commit e4ad9d1
Show file tree

Hide file tree

Showing 10 changed files with 5,230 additions and 5,230 deletions.
diff --git a/build/watermarker/base_library.zip b/build/watermarker/base_library.zip
diff --git a/build/watermarker/out00-Analysis.toc b/build/watermarker/out00-Analysis.toc
diff --git a/build/watermarker/out00-EXE.toc b/build/watermarker/out00-EXE.toc
diff --git a/build/watermarker/out00-PKG.pkg b/build/watermarker/out00-PKG.pkg
diff --git a/build/watermarker/out00-PKG.toc b/build/watermarker/out00-PKG.toc
diff --git a/build/watermarker/out00-PYZ.pyz b/build/watermarker/out00-PYZ.pyz
diff --git a/build/watermarker/out00-PYZ.toc b/build/watermarker/out00-PYZ.toc
diff --git a/build/watermarker/warnwatermarker.txt b/build/watermarker/warnwatermarker.txt
@@ -8,7 +8,6 @@ missing module named multiprocessing.get_start_method - imported by multiprocess
 missing module named resource - imported by posix, C:\Users\Stephen\Scripts\pdfconduit\watermarker.py
 missing module named posix - imported by os, C:\Users\Stephen\Scripts\pdfconduit\watermarker.py
 missing module named _posixsubprocess - imported by subprocess, multiprocessing.util, C:\Users\Stephen\Scripts\pdfconduit\watermarker.py
-missing module named org - imported by pickle, C:\Users\Stephen\Scripts\pdfconduit\watermarker.py
 missing module named readline - imported by cmd, code, pdb, C:\Users\Stephen\Scripts\pdfconduit\watermarker.py
 excluded module named _frozen_importlib - imported by importlib, importlib.abc, C:\Users\Stephen\Scripts\pdfconduit\watermarker.py
 missing module named _frozen_importlib_external - imported by importlib._bootstrap, importlib, importlib.abc, C:\Users\Stephen\Scripts\pdfconduit\watermarker.py
@@ -19,9 +18,10 @@ missing module named 'java.lang' - imported by platform, xml.sax._exceptions, C:
 missing module named vms_lib - imported by platform, C:\Users\Stephen\Scripts\pdfconduit\watermarker.py
 missing module named termios - imported by tty, getpass, tqdm._utils, C:\Users\Stephen\Scripts\pdfconduit\watermarker.py
 missing module named grp - imported by shutil, tarfile, pathlib, C:\Users\Stephen\Scripts\pdfconduit\watermarker.py
-missing module named pwd - imported by posixpath, shutil, tarfile, http.server, webbrowser, netrc, getpass, pathlib, C:\Users\Stephen\Scripts\pdfconduit\watermarker.py
 missing module named _dummy_threading - imported by dummy_threading, C:\Users\Stephen\Scripts\pdfconduit\watermarker.py
 missing module named 'org.python' - imported by copy, xml.sax, C:\Users\Stephen\Scripts\pdfconduit\watermarker.py
+missing module named pwd - imported by posixpath, shutil, tarfile, http.server, webbrowser, netrc, getpass, pathlib, C:\Users\Stephen\Scripts\pdfconduit\watermarker.py
+missing module named org - imported by pickle, C:\Users\Stephen\Scripts\pdfconduit\watermarker.py
 missing module named rlextra - imported by reportlab.lib.pdfencrypt
 missing module named pyphen - imported by reportlab.platypus.paragraph
 missing module named htmlentitydefs - imported by reportlab.platypus.paraparser
@@ -36,8 +36,8 @@ missing module named urllib2 - imported by reportlab.lib.utils
 missing module named 'reportlab.lib.pyHnj' - imported by reportlab.lib.utils
 missing module named Image - imported by reportlab.lib.utils
 missing module named olefile - imported by PIL.MicImagePlugin, PIL.FpxImagePlugin
-missing module named UserDict - imported by PIL.PdfParser
 missing module named Tkinter - imported by PIL.ImageTk
+missing module named UserDict - imported by PIL.PdfParser
 missing module named 'PySide.QtCore' - imported by PIL.ImageQt
 missing module named 'PyQt4.QtCore' - imported by PIL.ImageQt
 missing module named 'PyQt5.QtCore' - imported by PIL.ImageQt

diff --git a/dist/watermarker.exe b/dist/watermarker.exe
diff --git a/pdfconduit/__init__.py b/pdfconduit/__init__.py
@@ -1,6 +1,6 @@
 __all__ = ["upscale", "rotate", "Encrypt", "Merge", "Watermark", "Label", "WatermarkAdd", "slicer",
            "GUI"]
-__version__ = '1.1.1'
+__version__ = '1.1.2'
 __author__ = 'Stephen Neal'