Merge branch 'MDL-30007' of git://github.com/stronk7/moodle

This commit is contained in:
Sam Hemelryk 2011-12-01 17:14:52 +13:00
commit 6416c6c25b
210 changed files with 3243 additions and 471 deletions

View file

@ -1,5 +1,4 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
@ -26,5 +25,6 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2010090501;
$plugin->requires = 2010090501;
$plugin->version = 2011112900; // The current plugin version (Date: YYYYMMDDXX)
$plugin->requires = 2011112900; // Requires this Moodle version
$plugin->component = 'editor_textarea'; // Full name of the plugin (used for diagnostics)

View file

@ -1,5 +1,4 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
@ -26,6 +25,7 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2011101600;
$plugin->requires = 2011090700;
$plugin->release = '3.4.6';
$plugin->version = 2011112900; // The current plugin version (Date: YYYYMMDDXX)
$plugin->requires = 2011112900; // Requires this Moodle version
$plugin->component = 'editor_tinymce'; // Full name of the plugin (used for diagnostics)
$plugin->release = '3.4.6';