Update version to 4.6.0

diff --git a/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl
new file mode 100644 (file)
index 0000000..d1ebb72
--- /dev/null
+++ b/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 4.6.0 during upgrade *}

diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index 4c517e401b637ca8d8dc1bc8813f0801f6fa200d..ea2765e13db4feeb1e1793a889fccceb40cb57e3 100644 (file)
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -391,7 +391,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_domain` WRITE;
 /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
-INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.6.beta5',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.6.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
 /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
 UNLOCK TABLES;
 

diff --git a/xml/version.xml b/xml/version.xml
index 962fca8bd20e2b14e370c10fd98c475c710d1813..46a9a0a0f0e714d4c6bba271e96fd7fc9ee3192d 100644 (file)
--- a/xml/version.xml
+++ b/xml/version.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <version>
-  <version_no>4.6.beta5</version_no>
+  <version_no>4.6.0</version_no>
 </version>