Skip to content
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/v1.x' into refactor-mac-installer
Conflicts:
	.gitignore
  • Loading branch information
remixz committed Mar 4, 2015
commit cb069d4769ba593ff35b13683b60df13ca0c9125
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ deps/zlib/zlib.target.mk
# test artifacts
tools/faketime
icu_config.gypi
test.tap

# mac installer files
/tools/osx-pkg/osx-pkg-out.pkgproj
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.