diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
commit | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (patch) | |
tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /plugins/svn4idea/src/org/jetbrains/idea/svn/properties/PropertiesMap.java | |
parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
parent | 02cf98d65c798d368fcec43ed64a001d513bdd4f (diff) | |
download | idea-060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
build/scripts/tests.gant
Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/properties/PropertiesMap.java')
-rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/properties/PropertiesMap.java | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/properties/PropertiesMap.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/properties/PropertiesMap.java new file mode 100644 index 000000000000..c5857aa4b345 --- /dev/null +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/properties/PropertiesMap.java @@ -0,0 +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 org.jetbrains.idea.svn.properties; + +import com.intellij.util.containers.HashMap; + +/** + * @author Konstantin Kolosovsky. + */ +public class PropertiesMap extends HashMap<String, PropertyValue> { +} |