diff options
author | Florian Bruhin <git@the-compiler.org> | 2014-09-22 19:09:48 +0200 |
---|---|---|
committer | Florian Bruhin <git@the-compiler.org> | 2014-09-22 19:09:48 +0200 |
commit | 812a0fdd412e6493035870009c2152d756bd7251 (patch) | |
tree | 4e7b9f7bcf91d104c31e82fbb21b83becd41ad32 /setup.py | |
parent | 53b617590f7bad6cf622d788e9b286850d18ab13 (diff) | |
parent | cb53432969f14c110183a94c40d93056d6e0930d (diff) | |
download | qutebrowser-812a0fdd412e6493035870009c2152d756bd7251.tar.gz qutebrowser-812a0fdd412e6493035870009c2152d756bd7251.zip |
Merge branch 'newcmd'
Conflicts:
.flake8
pkg/PKGBUILD.qutebrowser-git
qutebrowser/browser/commands.py
qutebrowser/browser/hints.py
qutebrowser/config/configdata.py
qutebrowser/network/qutescheme.py
qutebrowser/test/config/test_configtypes.py
qutebrowser/utils/utils.py
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -42,7 +42,6 @@ try: setuptools.setup( packages=setuptools.find_packages(exclude=['qutebrowser.test']), include_package_data=True, - package_data={'qutebrowser': ['html/*', 'git-commit-id']}, entry_points={'gui_scripts': ['qutebrowser = qutebrowser.qutebrowser:main']}, test_suite='qutebrowser.test', |