Changeset 2610:a9bc70b5a85d for inc/prepend.php

Timestamp:

12/10/13 12:26:54 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

2608:3365c9df16a6 (diff), 2594:e10cf5fd3749 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2.6.2 commits into default branch

File:

• inc/prepend.php (modified) (3 diffs)

inc/prepend.php

@@ -10 +10 @@
 #
 # -- END LICENSE BLOCK -----------------------------------------
+
+/* Start tick  */
+define('DC_START_TIME',microtime(true));
 
 /* ------------------------------------------------------------------------------------------- */
@@ -135 +138 @@
 # Constants
 define('DC_ROOT',path::real(dirname(__FILE__).'/..'));
-define('DC_VERSION','2.6.2');
+define('DC_VERSION','2.7-dev');
 define('DC_DIGESTS',dirname(__FILE__).'/digests');
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');
@@ -141 +144 @@
 define('DC_DISTRIB_PLUGINS','aboutConfig,akismet,antispam,attachments,blogroll,blowupConfig,dclegacy,fairTrackbacks,importExport,maintenance,pages,pings,simpleMenu,tags,themeEditor,userPref,widgets');
 define('DC_DISTRIB_THEMES','blueSilence,blowupConfig,customCSS,default,ductile');
+define('DC_DEFAULT_TPLSET','mustek');
 
 if (!defined('DC_VENDOR_NAME')) {