Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master'
# Conflicts: # app/src/main/java/com/duy/calculator/symja/activities/DerivativeActivity.java # app/src/main/java/com/duy/calculator/symja/activities/ExpandAllExpressionActivity.java # app/src/main/java/com/duy/calculator/symja/activities/FactorExpressionActivity.java # app/src/main/java/com/duy/calculator/symja/activities/IntegrateActivity.java # app/src/main/java/com/duy/calculator/symja/activities/LimitActivity.java # app/src/main/java/com/duy/calculator/symja/activities/PrimitiveActivity.java # app/src/main/java/com/duy/calculator/symja/activities/SimplifyExpressionActivity.java # app/src/main/java/com/duy/calculator/symja/activities/SolveEquationActivity.java # app/src/main/java/com/duy/ncalc/graph/GraphActivity.java # app/src/main/java/com/duy/ncalc/systemequations/DefineSystemEquationFragment.java # app/src/main/java/com/duy/ncalc/systemequations/UndefineSystemEquationFragment.java
- Loading branch information
