MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	python/community/psi-api/src/com/jetbrains/python/PyNames.java
This commit is contained in:
Ekaterina Tuzova
2013-10-15 10:16:11 +02:00
parent 9132454299 6f0f73fe46
commit 7ed02a54b5
12 changed files with 213 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/psi-api/src/com/jetbrains/python/PyNames.java
+2
View File
@@ -119,6 +119,8 @@ public class PyNames {
public static final String COLLECTIONS = "collections";
public static final String COLLECTIONS_NAMEDTUPLE = COLLECTIONS + "." + NAMEDTUPLE;
public static final String FORMAT = "format";
public static final String ABSTRACTMETHOD = "abc.abstractmethod";
public static final String ABSTRACTPROPERTY = "abc.abstractproperty";