← Back to branch summary

~ensoft-opensource/ensoft-sextant/file-handling

~ensoft-opensource/ensoft-sextant/file-handling

Viewing all changes in revision 27.

Committer: patrickas at co
Date: 2014-09-04 13:10:18 UTC
mfrom: (16.2.5 ensoft-sextant)
Revision ID: patrickas@ensoft.co.uk-20140904131018-izci277z172q1kwa

First attempt at merging trunk

files modified:
etc/sextant.conf

resources/sextant/web/index.html *

resources/sextant/web/interface.html *

resources/sextant/web/queryjavascript.js *

resources/sextant/web/style_sheet.css *

src/sextant/environment.py

src/sextant/export.py

src/sextant/web/server.py

Show diffs side-by-side

added added

removed removed

etc/sextant.conf

resources/sextant/web/index.html

resources/sextant/web/interface.html

resources/sextant/web/queryjavascript.js

resources/sextant/web/style_sheet.css

src/sextant/environment.py

src/sextant/export.py

src/sextant/web/server.py

Older »