← Back to branch summary

~sahana-eden-jp/sahana-eden/reload_s3

~sahana-eden-jp/sahana-eden/reload_s3

Viewing all changes in revision 1612.1.82.

Committer: Michael Howden
Date: 2011-03-18 11:17:20 UTC
mfrom: (1908 eden)
mto: This revision was merged to the branch mainline in revision 1910.
Revision ID: michael@sahanafoundation.org-20110318111720-1ir9k7rld6fcx98y

Merge Trunk

files added:
static/selenium/scripts/GUI

static/selenium/scripts/GUI/mainWindow.py

static/selenium/scripts/GUI/selectTestsWindow.py

static/selenium/scripts/GUI/testConfig.py

files removed:
static/selenium/scripts/GUI

static/selenium/scripts/GUI/mainWindow.py

static/selenium/scripts/GUI/selectTestsWindow.py

static/selenium/scripts/GUI/testConfig.py

files modified:
VERSION

deployment-templates/models/000_config.py

languages/en-gb.py

models/00_tables.py

models/05_org.py

models/06_irs.py

modules/s3/s3gis.py

modules/s3/s3rest.py

Show diffs side-by-side

added added

removed removed

deployment-templates/models/000_config.py

languages/en-gb.py

models/00_tables.py

models/05_org.py

models/06_irs.py

modules/s3/s3gis.py

modules/s3/s3rest.py

static/selenium/scripts/GUI/

static/selenium/scripts/GUI/

static/selenium/scripts/GUI/mainWindow.py

static/selenium/scripts/GUI/mainWindow.py

static/selenium/scripts/GUI/selectTestsWindow.py

static/selenium/scripts/GUI/selectTestsWindow.py

static/selenium/scripts/GUI/testConfig.py

static/selenium/scripts/GUI/testConfig.py

Older »