rebase contacts clone to master
authorHoria Popa <horia.popa@movial.com>
Fri, 1 Jul 2011 10:08:55 +0000 (13:08 +0300)
committerHoria Popa <horia.popa@movial.com>
Fri, 1 Jul 2011 10:08:55 +0000 (13:08 +0300)
commit62a4bccae259572dab1902aef172c628c372f7c2
tree04bea405fc77623a131061c444d72a2a61bb90f6
parente1ce50091e0d1754975f26996e80510809e1214f
parenta43ea26ba6ba4e9286eb75c9274208e564e47c92
rebase contacts clone to master
Merge remote branch 'contacts-master/master'

Conflicts:
EditViewPortrait.qml
NewContactViewPortrait.qml
PhoneEditWidget.qml
AddressEditWidget.qml
ContactsExpandableDetails.qml
EditViewPortrait.qml
EmailEditWidget.qml
GroupedViewLandscape.qml
ImEditWidget.qml
NewContactViewPortrait.qml
PhoneEditWidget.qml
WebPageEditWidget.qml
main.qml