cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [5/5] git commit: fix merge issues
Date Tue, 27 May 2014 22:47:20 GMT
fix merge issues


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/commit/756e40c5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/tree/756e40c5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/diff/756e40c5

Branch: refs/heads/master
Commit: 756e40c5641dcda3926fbab0e0b09b1799e587d7
Parents: 6b19488 23152e8
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Tue May 27 15:39:08 2014 -0700
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Tue May 27 15:39:08 2014 -0700

----------------------------------------------------------------------
 NOTICE                               |   1 +
 doc/index.md                         |  72 +++++--
 plugin.xml                           |  15 +-
 src/android/ContactAccessor.java     |  66 +++---
 src/android/ContactAccessorSdk5.java |  79 +++----
 src/android/ContactInfoDTO.java      |  59 ++++++
 src/android/ContactManager.java      |  60 +++++-
 src/ios/CDVContacts.h                |   9 +
 src/ios/CDVContacts.m                |  34 ++-
 src/windows8/ContactProxy.js         | 178 +++++++---------
 src/wp/ContactPicker.xaml            |  73 +++++++
 src/wp/ContactPicker.xaml.cs         | 125 +++++++++++
 src/wp/ContactPickerTask.cs          | 122 +++++++++++
 src/wp/Contacts.cs                   | 333 +++++++++++------------------
 src/wp/ContactsHelper.cs             | 335 ++++++++++++++++++++++++++++++
 www/ContactFieldType.js              |  55 +++++
 www/ContactFindOptions.js            |   3 +-
 www/contacts.js                      |  26 ++-
 18 files changed, 1228 insertions(+), 417 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/blob/756e40c5/doc/index.md
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/blob/756e40c5/plugin.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/blob/756e40c5/src/ios/CDVContacts.m
----------------------------------------------------------------------


Mime
View raw message