Merge branch 'master' of git.labs.intellij.net:idea/community

Browse Source

...

This commit is contained in:

irengrig

2010-01-29 12:48:28 +03:00

parent d1afc1b59d 26d62866f0

commit 1ac195d08d

2 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

resources-en/src/fileTemplates/internal/Html.html.ft → platform/platform-resources-en/src/fileTemplates/internal/Html.html.ft

resources-en/src/fileTemplates/internal/Xhtml.xhtml.ft → platform/platform-resources-en/src/fileTemplates/internal/Xhtml.xhtml.ft