Files
gitx/GitX.xcodeproj
Nathan Kinsinger 98920bf0b1 Merge remote branch 'refs/remotes/dgrijalva/stable' into experimental
Conflicts:
	ApplicationController.m
	GitX.xcodeproj/project.pbxproj
	PBGitCommitView.xib
	PBGitHistoryView.xib
	PBGitRevisionCell.m
	PBGitTree.m
	PBGitWindowController.m
	PBViewController.m
	html/views/history/history.js
	html/views/history/index.html
2010-05-29 21:04:21 -06:00
..