kindle manager

kmanapp.spec

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # -*- mode: python ; coding: utf-8 -*-
 
 block_cipher = None
@@ -38,3 +39,46 @@ coll = COLLECT(exe,
                upx=True,
                upx_exclude=[],
                name='kmanapp')
+=======
+# -*- mode: python ; coding: utf-8 -*-
+
+block_cipher = None
+
+
+a = Analysis(['kman.py', 'kmanapp.py', 'kmanapp_rc.py', 'mainwindow.py', 'mtable.py', 'parseweb.py', ],
+             pathex=['/Users/mark/kman'],
+             binaries=[],
+             datas=[],
+             hiddenimports=[],
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher,
+             noarchive=False)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          [],
+          exclude_binaries=True,
+          name='kmanapp',
+          debug=False,
+          bootloader_ignore_signals=False,
+          strip=False,
+          upx=True,
+          console=False , icon='kmanapp.ico')
+coll = COLLECT(exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas,
+               strip=False,
+               upx=True,
+               upx_exclude=[],
+               name='kmanapp')
+app = BUNDLE(coll,
+             name='kmanapp.app',
+             icon='kmanapp.ico',
+             bundle_identifier=None)
+>>>>>>> 2d53124ab9aa26c9733646348174311d0967c8c0