Version update

DicomBrowser/DicomBrowser.py

@@ -503,10 +503,5 @@ def main(args=[],app=None):
 
 def mainargv():
 	'''setuptools compatible entry point.'''
-<<<<<<< HEAD
-	main(sys.argv)
-=======
 	freeze_support()
 	sys.exit(main(sys.argv))
-
->>>>>>> Version update

DicomBrowser/__init__.py

@@ -20,11 +20,7 @@
 from DicomBrowser import *
 
 __appname__='DicomBrowser'
-<<<<<<< HEAD
-__version_info__=(1,0,1) # global application version, major/minor/patch
-=======
 __version_info__=(1,1,0) # global application version, major/minor/patch
->>>>>>> Version update
 __version__='%i.%i.%i'%__version_info__
 __author__='Eric Kerfoot'
 __copyright__="Copyright (c) 2016 Eric Kerfoot, King's College London, all rights reserved. Licensed under the GPL (see LICENSE.txt)."

setup.py

@@ -68,7 +68,6 @@
 		for f in glob.glob('dist/%s/mkl_*.dll'%appname): # remove unnecessary MKL libraries
 			os.remove(f)
 	else:
-		#rm -rf libstdc++.so.6 libglib-2.0.so.0 libgobject-2.0.so.0 libgpg-error.so.0 share/icons
 		shutil.rmtree('dist/%s/share/icons'%appname)
 		for f in ['libstdc++.so.6','libglib-2.0.so.0','libgobject-2.0.so.0','libgpg-error.so.0']:
 			os.remove('dist/%s/%s'%(appname,f))