From 3dc23c436d0f91227afe32ee7359940534d53912 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Tue, 6 May 2014 15:25:13 +0100 Subject: [PATCH] Moving on to 1.10.1 development --- .datatables-commit-sync | 2 +- bower.json | 2 +- composer.json | 2 +- dataTables.jquery.json | 2 +- media/js/jquery.dataTables.js | 6 +++--- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 0c0a43de..253713fe 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -d3d92baf2cc7410ea65f924b7dd39bd1a8ef0770 +0d083ea96f3a3e5fc06d3b1a2104fc7b7c909967 diff --git a/bower.json b/bower.json index 25534239..d52edaab 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "datatables", - "version": "1.10.0", + "version": "1.10.1-dev", "main": [ "media/js/jquery.dataTables.js", "media/css/jquery.dataTables.css" diff --git a/composer.json b/composer.json index 696761b0..eb49841d 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "datatables/datatables", - "version": "1.10.0", + "version": "1.10.1-dev", "description": "DataTables is a plug-in for the jQuery Javascript library. It is a highly flexible tool, based upon the foundations of progressive enhancement, which will add advanced interaction controls to any HTML table.", "homepage": "http://www.datatables.net/", "author": "SpryMedia", diff --git a/dataTables.jquery.json b/dataTables.jquery.json index dcd7a642..88e6e678 100644 --- a/dataTables.jquery.json +++ b/dataTables.jquery.json @@ -1,6 +1,6 @@ { "name": "DataTables", - "version": "1.10.0", + "version": "1.10.1-dev", "description": "DataTables enhances HTML tables with the ability to sort, filter and page the data in the table very easily. It provides a comprehensive API and set of configuration options, allowing you to consume data from virtually any data source.", "homepage": "http://datatables.net/", "docs": "http://datatables.net/", diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index fce3d1a9..439c4237 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -1,11 +1,11 @@ -/*! DataTables 1.10.0 +/*! DataTables 1.10.1-dev * ©2008-2014 SpryMedia Ltd - datatables.net/license */ /** * @summary DataTables * @description Paginate, search and order HTML tables - * @version 1.10.0 + * @version 1.10.1-dev * @file jquery.dataTables.js * @author SpryMedia Ltd (www.sprymedia.co.uk) * @contact www.sprymedia.co.uk/contact @@ -8689,7 +8689,7 @@ * @type string * @default Version number */ - DataTable.version = "1.10.0"; + DataTable.version = "1.10.1-dev"; /** * Private data store, containing all of the settings objects that are diff --git a/package.json b/package.json index be99c986..b7c6506b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "DataTables", - "version": "1.10.0", + "version": "1.10.1-dev", "title": "DataTables", "author": { "name": "Allan Jardine",