Merge remote branch 'origin/master'

2011-07-14 19:03:42 +04:00
parent c0ef13f47c 99bf62827f
commit 80ab7a6ca6
1 changed files with 1 additions and 1 deletions
@@ -37,7 +37,7 @@ public class FunctionDescriptorImpl extends DeclarationDescriptorImpl implements
            @NotNull List<Annotation> annotations,
            @NotNull String name) {
        super(original.getContainingDeclaration(), annotations, name);
-        this.original = original;
+        this.original = original.getOriginal();
    }

    public FunctionDescriptorImpl initialize(