merging

2012-12-01 21:51:40 +04:00
parent c0e57175c8
commit 87254f5335
6 changed files with 45 additions and 9 deletions
--- a/core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java
+++ b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java
@@ -156,6 +156,7 @@ public enum CalculatorEventType {
    show_like_dialog,

    show_create_var_dialog,
+    show_create_matrix_dialog,
    show_create_function_dialog,

    //org.solovyev.android.calculator.plot.PlotInput