modified:   .gitignore
	modified:   Library/Taps/homebrew-games
	modified:   Library/Taps/homebrew-science
	modified:   Library/Taps/homebrew-versions
	modified:   Library/Taps/homebrew-dupes (modified content)
	modified:   Library/Taps/homebrew-science (modified content)
Merge branch 'linuxbrew' of https://github.com/sennychu/lbrew into linuxbrew

* 'linuxbrew' of https://github.com/sennychu/lbrew: (92 commits)
  r
  Library/Taps/homebrew-boneyard"
  r
  t
  u
  i
  Update hardware.rb
  Update hardware.rb
  Update hardware.rb
  Update hardware.rb
  Update doctor.rb
  Update doctor.rb
  Update doctor.rb
  Rename .gitignore to .gitignore_bk
  Update prune.rb
  Update doctor.rb
  Update doctor.rb
  Update version.rb
  Update formula_support.rb
  Update formula_lock.rb
  ...

Conflicts:
	Library/Taps/homebrew-games
	Library/Taps/homebrew-science
	Library/Taps/homebrew-versions

	modified:   .gitignore
	renamed:    Library/Formula/.gitignore -> Library/Formula/.gitignore_bk
	modified:   Library/Formula/binutils.rb
	modified:   Library/Formula/coreutils.rb
	modified:   Library/Formula/findutils.rb
	modified:   Library/Formula/git-flow-avh.rb
	modified:   Library/Formula/git.rb
	modified:   Library/Formula/gnu-indent.rb
	modified:   Library/Formula/gnu-sed.rb
	modified:   Library/Formula/gnu-time.rb
	modified:   Library/Formula/gnu-units.rb
	modified:   Library/Formula/gnu-which.rb
	modified:   Library/Homebrew/bottles.rb
	modified:   Library/Homebrew/build.rb
	modified:   Library/Homebrew/build_options.rb
	modified:   Library/Homebrew/cmd/--env.rb
	modified:   Library/Homebrew/cmd/doctor.rb
	modified:   Library/Homebrew/cmd/install.rb
	modified:   Library/Homebrew/cmd/prune.rb
	modified:   Library/Homebrew/cmd/update.rb
	modified:   Library/Homebrew/compilers.rb
	modified:   Library/Homebrew/dependency.rb
	modified:   Library/Homebrew/dependency_collector.rb
	modified:   Library/Homebrew/download_strategy.rb
	modified:   Library/Homebrew/exceptions.rb
	modified:   Library/Homebrew/extend/ARGV.rb
	modified:   Library/Homebrew/extend/ENV.rb
	modified:   Library/Homebrew/extend/ENV/std.rb
	modified:   Library/Homebrew/extend/fileutils.rb
	modified:   Library/Homebrew/extend/pathname.rb
	modified:   Library/Homebrew/extend/string.rb
	modified:   Library/Homebrew/formula.rb
	modified:   Library/Homebrew/formula_installer.rb
	modified:   Library/Homebrew/formula_lock.rb
	modified:   Library/Homebrew/formula_support.rb
	modified:   Library/Homebrew/hardware.rb
	modified:   Library/Homebrew/keg.rb
	modified:   Library/Homebrew/keg_fix_install_names.rb
	modified:   Library/Homebrew/mach.rb
	modified:   Library/Homebrew/macos.rb
	modified:   Library/Homebrew/options.rb
	modified:   Library/Homebrew/os/linux/hardware.rb
	modified:   Library/Homebrew/os/mac/hardware.rb
	modified:   Library/Homebrew/os/mac/xcode.rb
	modified:   Library/Homebrew/os/mac/xquartz.rb
	modified:   Library/Homebrew/requirements.rb
	new file:   Library/Homebrew/requirements/macos_requirement.rb
	modified:   Library/Homebrew/requirements/python_dependency.rb
	new file:   Library/Homebrew/superenv.rb
	new file:   Library/Homebrew/superenv/macsystem.rb
	modified:   Library/Homebrew/tab.rb
	modified:   Library/Homebrew/version.rb
	deleted:    Library/Taps/homebrew-apache
	deleted:    Library/Taps/homebrew-boneyard
	deleted:    Library/Taps/homebrew-completions
	deleted:    Library/Taps/homebrew-dupes
	deleted:    Library/Taps/homebrew-headonly
	deleted:    Library/Taps/homebrew-x11
	deleted:    Library/Taps/sennychu-tap
	modified:   Library/Taps/homebrew-science (modified content)
Merge branch 'linuxbrew' of https://github.com/sennychu/lbrew into linuxbrew

* 'linuxbrew' of https://github.com/sennychu/lbrew:
  Update update.rb
Merge branch 'linuxbrew' of https://github.com/sennychu/lbrew into linuxbrew

* 'linuxbrew' of https://github.com/sennychu/lbrew:
  Update hardware.rb
  Update hardware.rb
  Update hardware.rb
  Update doctor.rb
Merge branch 'linuxbrew' of https://github.com/sennychu/lbrew into linuxbrew

* 'linuxbrew' of https://github.com/sennychu/lbrew:
  Update --config.rb
Merge branch 'linuxbrew' of https://github.com/sennychu/lbrew into linuxbrew

* 'linuxbrew' of https://github.com/sennychu/lbrew:
  Update doctor.rb
Merge branch 'linuxbrew' of https://github.com/sennychu/lbrew into linuxbrew

* 'linuxbrew' of https://github.com/sennychu/lbrew:
  Update doctor.rb
Merge branch 'linuxbrew' of https://github.com/sennychu/lbrew into linuxbrew

* 'linuxbrew' of https://github.com/sennychu/lbrew:
  Update doctor.rb
Merge branch 'linuxbrew' of https://github.com/sennychu/lbrew into linuxbrew

* 'linuxbrew' of https://github.com/sennychu/lbrew:
  Update doctor.rb
	deleted:    Library/Formula/android-sdk.rb
	typechange: Library/Formula/apple-gcc42.rb
	modified:   Library/Formula/autoconf.rb
	deleted:    Library/Formula/fastascripts.rb
	modified:   Library/Formula/gettext.rb
	modified:   Library/Formula/libtool.rb
	modified:   Library/LinkedKegs/coreutils
	modified:   Library/Taps/homebrew-science (modified content)
	modified:   .gitignore
	modified:   .gitignore
	modified:   Library/Formula/.gitignore_bk
	new file:   Library/Formula/abiword.rb
	new file:   Library/Formula/adol-c.rb
	new file:   Library/Formula/ann.rb
	new file:   Library/Formula/armadillo.rb
	new file:   Library/Formula/bact.rb
	new file:   Library/Formula/bali-phy.rb
	new file:   Library/Formula/bedtools.rb
	new file:   Library/Formula/cdo.rb
	new file:   Library/Formula/cminpack.rb
	new file:   Library/Formula/colpack.rb
	new file:   Library/Formula/exonerate.rb
	new file:   Library/Formula/fann.rb
	new file:   Library/Formula/field3d.rb
	new file:   Library/Formula/flann.rb
	new file:   Library/Formula/glpk.rb
	new file:   Library/Formula/gmt.rb
	new file:   Library/Formula/h5utils.rb
	new file:   Library/Formula/hdf5.rb
	new file:   Library/Formula/igraph.rb
	new file:   Library/Formula/insighttoolkit.rb
	new file:   Library/Formula/libmatio.rb
	new file:   Library/Formula/mafft.rb
	new file:   Library/Formula/mallet.rb
	new file:   Library/Formula/mame.rb
	new file:   Library/Formula/mathgl.rb
	new file:   Library/Formula/mathomatic.rb
	new file:   Library/Formula/maxima.rb
	new file:   Library/Formula/mcl.rb
	new file:   Library/Formula/metis.rb
	new file:   Library/Formula/minc.rb
	new file:   Library/Formula/mpsolve.rb
	new file:   Library/Formula/nauty.rb
	new file:   Library/Formula/ncview.rb
	new file:   Library/Formula/netcdf.rb
	new file:   Library/Formula/octave.rb
	new file:   Library/Formula/opencv.rb
	new file:   Library/Formula/openimageio.rb
	new file:   Library/Formula/openmeeg.rb
	new file:   Library/Formula/parmetis.rb
	new file:   Library/Formula/pastix.rb
	new file:   Library/Formula/pnapi.rb
	new file:   Library/Formula/pulseaudio.rb
        new file:   Library/Formula/qhull.rb
	new file:   Library/Formula/qt-mobility.rb
	new file:   Library/Formula/r.rb
	new file:   Library/Formula/radx.rb
	new file:   Library/Formula/rom-tools.rb
	new file:   Library/Formula/root.rb
	new file:   Library/Formula/scotch.rb
	new file:   Library/Formula/suite-sparse.rb
	new file:   Library/Formula/symphony.rb
	new file:   Library/Formula/triangle.rb
	new file:   Library/Formula/unafold.rb
	new file:   Library/Formula/vcftools.rb
	new file:   Library/Formula/vips.rb
	new file:   Library/Formula/vtk.rb
	new file:   Library/Formula/wxmaxima.rb