Official Moodle git projects - moodle.git/commit

projects / moodle.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 379f39e 35d7256)

author	Sam Hemelryk <sam@moodle.com>
	Mon, 13 Jun 2011 08:54:52 +0000 (16:54 +0800)
committer	Sam Hemelryk <sam@moodle.com>
	Mon, 13 Jun 2011 08:54:52 +0000 (16:54 +0800)
commit	46d3b9be73585100a72c6ec830871721071b4097
tree	85135031f4ad08f4584e80583987dba3429e1a84	tree \| snapshot
parent	379f39eb9fd6fc48d34a420cab6d1fae73623860	commit \| diff
parent	35d725627cc8874317d194b7c0b70a1e243c825b	commit \| diff

Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes

13 files changed:

lang/en/message.php	diff1 \|	diff2 \|	blob \| history
lang/en/notes.php	diff1 \|	diff2 \|	blob \| history
lang/en/question.php	diff1 \|	diff2 \|	blob \| history
lib/blocklib.php	diff1 \|	diff2 \|	blob \| history
lib/questionlib.php	diff1 \|	diff2 \|	blob \| history
message/lib.php	diff1 \|	diff2 \|	blob \| history
mod/assignment/lib.php	diff1 \|	diff2 \|	blob \| history
mod/forum/lang/en/forum.php	diff1 \|	diff2 \|	blob \| history
mod/quiz/lang/en/quiz.php	diff1 \|	diff2 \|	blob \| history
mod/quiz/lib.php	diff1 \|	diff2 \|	blob \| history
mod/wiki/lang/en/wiki.php	diff1 \|	diff2 \|	blob \| history
mod/wiki/lib.php	diff1 \|	diff2 \|	blob \| history
mod/workshop/lang/en/workshop.php	diff1 \|	diff2 \|	blob \| history

Moodle official production repository