Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Thu, 18 Nov 2010 08:47:15 +0000 (11:47 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Thu, 18 Nov 2010 08:47:15 +0000 (11:47 +0300)
commita7a8315a03866f0f6c91b0234e44ed4195c2946d
tree19f742036316c58652e430fe3eb6e41b39fc1152
parent10b86cbdaa39e8dd692da54b92b8f5a67e1e6348
parent90cfcf81860e3236e1c811b87fc5855a77a30e59
Merge branch 'master' of git.labs.intellij.net:idea/community
plugins/git4idea/src/META-INF/plugin.xml
plugins/git4idea/src/git4idea/history/GitHistoryUtils.java
plugins/git4idea/src/git4idea/history/GitLogParser.java
plugins/git4idea/src/git4idea/history/GitLogRecord.java
plugins/git4idea/tests/git4idea/tests/GitHistoryUtilsTestCase.java