Merge commit 'refs/remotes/andreberg/master' into test_merge

Conflicts:
	ApplicationController.m
	GitX.xcodeproj/project.pbxproj
	PBGitHistoryView.xib
	PBGitTree.m
	PBViewController.m
This commit is contained in:
German Laullon
2010-06-14 16:39:06 -07:00
97 changed files with 6927 additions and 1265 deletions
+2 -1
View File
@@ -15,7 +15,8 @@
.diff .file .diffContent {
white-space: pre;
font-family: Menlo, Monaco;
font-family: Meslo, "Andale Mono", Menlo, Monaco;
font-size: 11px;
}
.diff .file .diffcontent .lineno {