summaryrefslogtreecommitdiff
path: root/platform/vcs-log/api
diff options
context:
space:
mode:
Diffstat (limited to 'platform/vcs-log/api')
-rw-r--r--platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogSettings.java18
-rw-r--r--platform/vcs-log/api/vcs-log-api.iml3
2 files changed, 18 insertions, 3 deletions
diff --git a/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogSettings.java b/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogSettings.java
index a370379b4d77..f382e23cf480 100644
--- a/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogSettings.java
+++ b/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogSettings.java
@@ -1,10 +1,24 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.intellij.vcs.log;
-import com.intellij.openapi.components.StoragePathMacros;
/**
* <p>Vcs Log user settings, which may have a UI representation, or be implicitly selected based on user actions.</p>
- * <p>Most of the settings are workspace-specific, i. e. they are stored in {@link StoragePathMacros#WORKSPACE_FILE workspace.xml}.</p>
+ * <p>Most of the settings are workspace-specific, i. e. they are stored in {@link com.intellij.openapi.components.StoragePathMacros#WORKSPACE_FILE workspace.xml}.</p>
*
* @author Kirill Likhodedov
*/
diff --git a/platform/vcs-log/api/vcs-log-api.iml b/platform/vcs-log/api/vcs-log-api.iml
index bdbe62ba331d..92d746615afa 100644
--- a/platform/vcs-log/api/vcs-log-api.iml
+++ b/platform/vcs-log/api/vcs-log-api.iml
@@ -10,8 +10,9 @@
<orderEntry type="module" module-name="util-rt" />
<orderEntry type="module" module-name="vcs-log-graph-api" exported="" />
<orderEntry type="module" module-name="core-api" />
- <orderEntry type="module" module-name="vcs-api" />
<orderEntry type="library" name="JUnit4" level="project" />
+ <orderEntry type="module" module-name="vcs-api-core" />
+ <orderEntry type="module" module-name="editor-ui-api" />
</component>
</module>