code.vuplus.com Git - vuplus_openembedded/commit

author	John Lee <john_lee@openmoko.org>
	Fri, 7 Mar 2008 12:39:27 +0000 (12:39 +0000)
committer	John Lee <john_lee@openmoko.org>
	Fri, 7 Mar 2008 12:39:27 +0000 (12:39 +0000)
commit	e906546390539db91733531aa8007a59fcc3b60f
tree	2d89a492846a2c0b4310abad9d943eee71d0e494	tree \| snapshot
parent	5a42b280d244be8ddc18eb07826a7cf4c3c605c1	commit \| diff

solving merge conflict

20 files changed:

packages/alsa/alsa-state/fic-gta02/gsmhandset.state	[deleted file]	blob \| history
packages/gnash/gnash.inc	[deleted file]	blob \| history
packages/gnash/gnash_0.8.1.bb	[deleted file]	blob \| history
packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty	[deleted file]	blob \| history
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch	[deleted file]	blob \| history
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch	[deleted file]	blob \| history
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch	[deleted file]	blob \| history
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop	[deleted file]	blob \| history
packages/gpsdrive/gpsdrive_2.10pre4.bb	[deleted file]	blob \| history
packages/multitap-pad/.mtn2git_empty	[deleted file]	blob \| history
packages/multitap-pad/files/.mtn2git_empty	[deleted file]	blob \| history
packages/multitap-pad/files/80multitappad	[deleted file]	blob \| history
packages/multitap-pad/multitap-pad_svn.bb	[deleted file]	blob \| history
packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb	[deleted file]	blob \| history
packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty	[deleted file]	blob \| history
packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch	[deleted file]	blob \| history
packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty	[deleted file]	blob \| history
packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch	[deleted file]	blob \| history
packages/perl/libwww-perl-native_5.808.bb	[deleted file]	blob \| history
packages/perl/libwww-perl_5.808.bb	[deleted file]	blob \| history

openembedded 1.6 repository.

RSS Atom