merge
authorGraeme Gregory <dp@xora.org.uk>
Thu, 20 Mar 2008 06:21:19 +0000 (06:21 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 20 Mar 2008 06:21:19 +0000 (06:21 +0000)
commit1008c8c2925767928b47d87b1e4b64004ea3d51b
tree82252a9ceacb07c076fa68c7afeb9636356d1264
parent2ac70b712f904c0cd5bad14711a6e92ffae2c157
merge
15 files changed:
packages/gypsy/files/docs-reference-am.patch [deleted file]
packages/openmoko-projects.merge/.mtn2git_empty [moved from packages/openmoko-projects/.mtn2git_empty with 100% similarity]
packages/openmoko-projects.merge/assassin_svn.bb [moved from packages/openmoko-projects/assassin_svn.bb with 100% similarity]
packages/openmoko-projects.merge/diversity-daemon_svn.bb [moved from packages/openmoko-projects/diversity-daemon_svn.bb with 100% similarity]
packages/openmoko-projects.merge/diversity-nav_svn.bb [moved from packages/openmoko-projects/diversity-nav_svn.bb with 100% similarity]
packages/openmoko-projects.merge/illume/.mtn2git_empty [moved from packages/openmoko-projects/illume/.mtn2git_empty with 100% similarity]
packages/openmoko-projects.merge/illume/include-path.diff [moved from packages/openmoko-projects/illume/include-path.diff with 100% similarity]
packages/openmoko-projects.merge/illume_svn.bb [moved from packages/openmoko-projects/illume_svn.bb with 100% similarity]
packages/openmoko-projects.merge/tangogps/.mtn2git_empty [moved from packages/openmoko-projects/tangogps/.mtn2git_empty with 100% similarity]
packages/openmoko-projects.merge/tangogps/global-config-h.patch [moved from packages/openmoko-projects/tangogps/global-config-h.patch with 100% similarity]
packages/openmoko-projects.merge/tangogps_0.7.bb [moved from packages/openmoko-projects/tangogps_0.7.bb with 100% similarity]
packages/packagekit.merge/.mtn2git_empty [moved from packages/packagekit/.mtn2git_empty with 100% similarity]
packages/packagekit.merge/files/.mtn2git_empty [moved from packages/packagekit/files/.mtn2git_empty with 100% similarity]
packages/packagekit.merge/files/disable-docbook2man.patch [moved from packages/packagekit/files/disable-docbook2man.patch with 100% similarity]
packages/packagekit.merge/packagekit_git.bb [moved from packages/packagekit/packagekit_git.bb with 100% similarity]