Tim Hunt 74c479f212 MDL-20636 Merge branch 'master' into qe2_wip ...

Conflicts:
	lib/questionlib.php
	question/type/calculated/lang/en/qtype_calculated.php
	question/type/questiontype.php

2011-02-03 11:18:40 +00:00

..

lang/en

theme/base MDL-21862 some docs and a default screenshot (also used for base unfortunately)

2010-04-20 16:46:49 +00:00

layout

themes lib MDL-24895 Multiple fixes to better handle overflow.

2010-11-05 02:53:47 +00:00

pix

Removing rubbish screenshot from base

2010-04-21 03:00:52 +00:00

style

MDL-20636 Merge branch 'master' into qe2_wip

2011-02-03 11:18:40 +00:00

config.php

themes lib MDL-24895 Multiple fixes to better handle overflow.

2010-11-05 02:53:47 +00:00