openmoko-session2.bb, openmoko-today2-folders_svn.bb : conflict/replace
authorGraeme Gregory <dp@xora.org.uk>
Tue, 13 Nov 2007 15:02:00 +0000 (15:02 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 13 Nov 2007 15:02:00 +0000 (15:02 +0000)
commit9f0bd5cd2d93a2ed76637ca5bbf207e763fc7edf
treeb3a46747e5791994a544d40775a8549c925a1c86
parente029c63dd68e32381d582aadcbce368b1873f850
openmoko-session2.bb, openmoko-today2-folders_svn.bb : conflict/replace
matchbox-common
packages/openmoko2/openmoko-session2.bb
packages/openmoko2/openmoko-today2-folders_svn.bb