[oe-commits] org.oe.dev solving merge conflict

[john_lee commit]

solving merge conflict

Author: john_lee at openembedded.org
Branch: org.openembedded.dev
Revision: cb58be96e7128aa032b10e0b9d369ca6f59af487
ViewMTN: http://monotone.openembedded.org/revision/info/cb58be96e7128aa032b10e0b9d369ca6f59af487
Files:
1
packages/alsa/alsa-state/fic-gta02/gsmhandset.state
packages/gnash/gnash.inc
packages/gnash/gnash_0.8.1.bb
packages/gpsdrive/gpsdrive-2.10pre4
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
packages/gpsdrive/gpsdrive_2.10pre4.bb
packages/multitap-pad
packages/multitap-pad/files
packages/multitap-pad/files/80multitappad
packages/multitap-pad/multitap-pad_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
packages/openmoko2/openmoko-dialer2/fic-gta01
packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch
packages/openmoko2/openmoko-dialer2/fic-gta02
packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch
packages/perl/libwww-perl-native_5.808.bb
packages/perl/libwww-perl_5.808.bb
Diffs:

#
# mt diff -rcf1e2bc5ee87871b3d33f7110d0d3803528b6d77 -rcb58be96e7128aa032b10e0b9d369ca6f59af487
#
#
#
# delete "packages/alsa/alsa-state/fic-gta02/gsmhandset.state"
# 
# delete "packages/gnash/gnash.inc"
# 
# delete "packages/gnash/gnash_0.8.1.bb"
# 
# delete "packages/gpsdrive/gpsdrive-2.10pre4"
# 
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch"
# 
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch"
# 
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch"
# 
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"
# 
# delete "packages/gpsdrive/gpsdrive_2.10pre4.bb"
# 
# delete "packages/multitap-pad"
# 
# delete "packages/multitap-pad/files"
# 
# delete "packages/multitap-pad/files/80multitappad"
# 
# delete "packages/multitap-pad/multitap-pad_svn.bb"
# 
# delete "packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb"
# 
# delete "packages/openmoko2/openmoko-dialer2/fic-gta01"
# 
# delete "packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch"
# 
# delete "packages/openmoko2/openmoko-dialer2/fic-gta02"
# 
# delete "packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch"
# 
# delete "packages/perl/libwww-perl-native_5.808.bb"
# 
# delete "packages/perl/libwww-perl_5.808.bb"
#