Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update #1

Merged
merged 296 commits into from
Mar 10, 2016
Merged

Update #1

merged 296 commits into from
Mar 10, 2016

Conversation

PhilJay
Copy link
Owner

@PhilJay PhilJay commented Mar 10, 2016

No description provided.

danielgindi and others added 30 commits November 29, 2015 10:10
Remove useless parentheses causing swift build error
We can just check for _data being null,
knowing that this is the situation defined as "no data"
Call `initialize` for `dataSets` setter
The force unwrapping in entryCount caused a crash when yVals was nil. Now entryCount returns 0.
Add missing images for bar chart tests
Use nil coalescing in ChartDataSet's entryCount (Fixes #631)
danielgindi and others added 28 commits February 29, 2016 00:08
# Conflicts:
#	Charts/Classes/Charts/ChartViewBase.swift
#	Charts/Classes/Renderers/PieChartRenderer.swift
Although this will not last for long.
Next iOS 7 release will mean removing support for 7.0.
The tests caught this... Happened during OSX port.
Add trailing newline for preprocessor statement
Set code signing identity for iOS targets
…charts into ezamagni-stepped-linecharts

# Conflicts:
#	ChartsDemo/Classes/RealmDemos/RealmLineChartViewController.m
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This was a residue that was removed from the Android side already
PhilJay added a commit that referenced this pull request Mar 10, 2016
@PhilJay PhilJay merged commit 38e5ca7 into PhilJay:master Mar 10, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.