Merged with upstream master

This commit is contained in:
Daniel Penkin
2012-05-08 12:08:37 +04:00
parent 1c55796a92
commit 1484e8852c
@@ -26,6 +26,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.k2js.config.Config;
import org.jetbrains.k2js.facade.K2JSTranslator;
import org.jetbrains.k2js.facade.MainCallParameters;
import org.jetbrains.k2js.facade.exceptions.TranslationException;
import java.io.File;
import java.nio.charset.Charset;