Merge remote-tracking branch 'origin/master' into loki/newlog
authorKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Thu, 22 Aug 2013 13:35:07 +0000 (17:35 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Thu, 22 Aug 2013 13:35:07 +0000 (17:35 +0400)
Conflicts:
.idea/modules.xml
platform/platform-resources/src/META-INF/VcsExtensionPoints.xml

1  2 
.idea/modules.xml
platform/platform-resources-en/src/misc/registry.properties
platform/platform-resources/src/META-INF/VcsExtensionPoints.xml
plugins/git4idea/git4idea.iml
plugins/git4idea/src/META-INF/plugin.xml
plugins/git4idea/src/git4idea/GitVcs.java

Simple merge
index 23dc8536cb97323a8b7e7ae3e73d8c1bcbd998bd,0676fe268fa5966cc468c21b7d4416a5c23c5e1b..db8c70572d15d94344be5b0e2d20a2b7715fd12c
@@@ -294,5 -300,18 +300,19 @@@ search.everywhere.enabled=fals
  junit_sm_runner=false
  testng_sm_runner=false
  show.flex.debug.design.view=false
 +git.new.log=false
  
 -GRADLE.system.in.process.description=Whether IDEA should use 'in-process' mode for interaction with gradle api
+ completion.enable.relevant.method.chain.suggestions=false
+ ide.mac.message.sheets.java.emulation=false
+ # suppress inspection "UnusedProperty"
+ ide.mac.message.sheets.java.emulation.description=Use Java message sheets instead of native ones
+ linux.native.menu=false
+ linux.native.menu.description=Enables native menu on Ubuntu
+ windows.jumplist=false
+ windows.jumplist.description=Enables JumpLists on Windows
+ # suppress inspection "UnusedProperty"
+ GRADLE.system.in.process=true
+ # suppress inspection "UnusedProperty"
++GRADLE.system.in.process.description=Whether IDEA should use 'in-process' mode for interaction with gradle api
index 11564d47d6668617515b83913285d5bf90ee4558,9dce5d4d7f4b48195b3b64295777c4cccd596d6f..d6e466d719c13ba67643182fee2ac409b6014950
      <extensionPoint name="vcsAnnotationGutterActionProvider" interface="com.intellij.openapi.vcs.annotate.AnnotationGutterActionProvider"/>
      <extensionPoint name="vcschangedetails" interface="com.intellij.openapi.vcs.changes.VcsChangeDetailsProvider" area="IDEA_PROJECT"/>
  
+     <extensionPoint name="vcs.taskHandler" interface="com.intellij.openapi.vcs.VcsTaskHandler" area="IDEA_PROJECT"/>
+     
+     <extensionPoint name="vcs.rootFinder" interface="com.intellij.openapi.vcs.VcsRootFinder" area="IDEA_PROJECT"/>
 +    <extensionPoint name="logProvider" interface="com.intellij.vcs.log.VcsLogProvider" area="IDEA_PROJECT"/>
    </extensionPoints>
  </idea-plugin>
Simple merge
index 891bce29e5a79d82915ace8f00252ecfb788d940,06a2ce7679abaeab7a66e5a608887d45e59888c9..723e0daa57f924ae54b122fa227fa042344792fb
      <vcsPopupProvider implementation="git4idea.actions.GitQuickListContentProvider"/>
      <vcsCheckinHandlerFactory implementation="git4idea.checkin.GitCheckinHandlerFactory"/>
      <checkinHandlerFactory implementation="git4idea.checkin.UnresolvedMergeCheckFactory"/>
 -
 +    <logProvider implementation="git4idea.log.GitLogProvider"/>
      <vcsChangesViewRefresher implementation="git4idea.changes.GitChangesViewRefresher" />
+     
+     <vcs.rootFinder implementation="git4idea.roots.GitRootFinder"/>
  
      <projectService
        serviceInterface="git4idea.history.wholeTree.LogFactoryService"