Public Git Hosting - grub2/phcoder.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 51e381f a82e80a)

commit	56fb2f1dc1b7114565155acb370230d6d2b40b6c
author	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Fri, 7 Aug 2009 14:20:31 +0000 (7 16:20 +0200)
committer	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Fri, 7 Aug 2009 14:20:31 +0000 (7 16:20 +0200)
tree	33467d20bf8c8bb39db7b1374e4612c0ac057e67	tree \| snapshot (tar.gz zip)
parent	51e381f766e70432e26436e5bbce1ae855b11041	commit \| diff
parent	a82e80adc2a9425d53b02282395419586004182e	commit \| diff

Merge branch 'makefile' into haiku

Conflicts:
ChangeLog
conf/common.rmk
conf/i386-pc.rmk
configure.ac
genmk.rb

13 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
Makefile.in	diff1 \|	diff2 \|	blob \| history
conf/common.rmk	diff1 \|	diff2 \|	blob \| history
conf/i386-coreboot.rmk	diff1 \|	diff2 \|	blob \| history
conf/i386-ieee1275.rmk	diff1 \|	diff2 \|	blob \| history
conf/i386-pc.rmk	diff1 \|	diff2 \|	blob \| history
conf/powerpc-ieee1275.rmk	diff1 \|	diff2 \|	blob \| history
conf/sparc64-ieee1275.rmk	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
font/font.c	diff1 \|	diff2 \|	blob \| history
term/gfxterm.c	diff1 \|	diff2 \|	blob \| history
util/getroot.c	diff1 \|	diff2 \|	blob \| history
util/hostdisk.c	diff1 \|	diff2 \|	blob \| history

phcoder's pending patches for grub2