LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge branch 'master' into py-package

Browse Source 
Conflicts:
	overviewerConfig.js
	overviewer_core/data/overviewerConfig.js
	setup.py
	web_assets/overviewerConfig.js
This commit is contained in:
Aaron Griffith
2011-05-13 21:37:35 -04:00
parent e64af5baef 6dd3ac067c
commit e84ef2c1d2
11 changed files with 135 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
setup.py
View File

@@ -51,8 +51,7 @@ if py2exe is not None:
setup_kwargs['packages'] = ['overviewer_core']
setup_kwargs['scripts'] = ['overviewer.py']
setup_kwargs['package_data'] = {'overviewer_core':
['data/overviewerConfig.js',
'data/textures/*',
['data/textures/*',
'data/web_assets/*']}