Merge branch 'master' of github.com:masayuki0812/c3

b6477ea5 · Kyle Campbell · 75166f3f · 602f3775 · b6477ea5 · b6477ea5
Commit b6477ea5 authored Apr 12, 2014 by Kyle Campbell
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

bower.json bower.json +1 -1

c3.js c3.js +2 -2

c3.min.js c3.min.js +0 -0

package.json package.json +1 -1

No files found.
--- a/bower.json
+++ b/bower.json
 {
  "name": "c3",
  "main": "c3.min.js",
-  "version": "0.1.30",
+  "version": "0.1.31",
  "homepage": "https://github.com/masayuki0812/c3",
  "authors": [
    "Masayuki Tanaka <masayuki0812@mac.com>"

--- a/c3.js
+++ b/c3.js
@@ -2,7 +2,7 @@
    'use strict';

    var c3 = {
-        version: "0.1.30"
+        version: "0.1.31"
    };

    var CLASS = {
@@ -173,7 +173,7 @@
            __axis_x_tick_culling_max = getConfig(['axis', 'x', 'tick', 'culling', 'max'], 10),
            __axis_x_tick_count = getConfig(['axis', 'x', 'tick', 'count']),
            __axis_x_tick_fit = getConfig(['axis', 'x', 'tick', 'fit'], false),
-            __axis_x_tick_values = getConfig(['axis', 'x', 'tick', 'values'], []),
+            __axis_x_tick_values = getConfig(['axis', 'x', 'tick', 'values'], null),
            __axis_x_max = getConfig(['axis', 'x', 'max']),
            __axis_x_min = getConfig(['axis', 'x', 'min']),
            __axis_x_default = getConfig(['axis', 'x', 'default']),

--- a/c3.min.js
+++ b/c3.min.js
--- a/package.json
+++ b/package.json
 {
  "name": "c3",
-  "version": "0.1.30",
+  "version": "0.1.31",
  "description": "D3-based reusable chart library",
  "main": "c3.js",
  "scripts": {