diff --git a/.gitignore b/.gitignore index b3afdfd551..bf4993e030 100644 --- a/.gitignore +++ b/.gitignore @@ -19,8 +19,9 @@ gen-java .svn ### IntelliJ IDEA ### -.idea -.idea/ +.idea/* +!.idea/vcs.xml +!.idea/icon.png *.iws *.iml *.ipr diff --git a/.idea/icon.png b/.idea/icon.png new file mode 100644 index 0000000000..33fb271cf1 Binary files /dev/null and b/.idea/icon.png differ diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000..4d824917a7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,36 @@ + + + + + + + + + +