0
Commit Graph

7 Commits

Author SHA1 Message Date
Aaron Griffith
fde647bfdf Merge branch 'py-package'
Conflicts:
	setup.py
2011-07-10 18:14:20 -04:00
Aaron Griffith
c10074e87f Merge branch 'master' into py-package 2011-06-04 20:05:31 -04:00
Aaron Griffith
2b7fce9bce Merge branch 'master' into py-package 2011-05-28 15:15:06 -04:00
Aaron Griffith
383b01859f Merge branch 'master' into py-package
Conflicts:
	overviewer_core/data/config.js
	overviewer_core/data/web_assets/functions.js
	overviewer_core/data/web_assets/style.css
	setup.py
	web_assets/overviewer.css
	web_assets/style.css
2011-05-10 20:19:10 -04:00
Aaron Griffith
299f15a312 Merge branch 'dtt-c-render' into py-package 2011-04-13 02:42:22 -04:00
Aaron Griffith
115c36ad5e Merge branch 'dtt-c-render' into py-package
Conflicts:
	overviewer.py
2011-04-01 22:00:45 -04:00
Aaron Griffith
42596416d9 sdist and install now work
next step is using a custom data dir, and falling back on the package
data dir. Also, fixing --version.
2011-03-29 13:49:50 -04:00