From bad69bac22e6ddf153827c9553aa350a3dcd31f0 Mon Sep 17 00:00:00 2001 From: Pavel Talanov Date: Sat, 28 Jan 2012 17:57:47 +0400 Subject: [PATCH] fixed a couple of problems introduced with rebase before previous push --- .idea/workspace.xml | 1058 ++++++++++++++--- .../org/jetbrains/k2js/K2JSTranslator.java | 4 + .../k2js/translate/utils/DescriptorUtils.java | 55 +- .../org/jetbrains/k2js/test/FunctionTest.java | 26 - 4 files changed, 974 insertions(+), 169 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f393e9fffb8..027f1999a71 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -10,22 +10,13 @@ - - - - - + - - - - - - - + + @@ -295,10 +286,10 @@ - + - + @@ -307,7 +298,7 @@ - + @@ -389,48 +380,73 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -443,34 +459,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -486,7 +475,7 @@ -