Merge remote-tracking branch 'origin/master'
Conflicts: src/com/savoirfairelinux/sflphone/client/SFLphoneApplication.java
No related branches found
No related tags found
Showing
- src/com/savoirfairelinux/sflphone/account/AccountManagementUI.java 0 additions, 50 deletions...avoirfairelinux/sflphone/account/AccountManagementUI.java
- src/com/savoirfairelinux/sflphone/account/AccountSelectionSpinner.java 49 additions, 46 deletions...rfairelinux/sflphone/account/AccountSelectionSpinner.java
- src/com/savoirfairelinux/sflphone/adapters/AccountSelectionAdapter.java 4 additions, 0 deletions...fairelinux/sflphone/adapters/AccountSelectionAdapter.java
- src/com/savoirfairelinux/sflphone/adapters/CallElementAdapter.java 62 additions, 10 deletions...avoirfairelinux/sflphone/adapters/CallElementAdapter.java
- src/com/savoirfairelinux/sflphone/client/SFLPhoneHomeActivity.java 451 additions, 462 deletions...avoirfairelinux/sflphone/client/SFLPhoneHomeActivity.java
- src/com/savoirfairelinux/sflphone/client/SFLphoneApplication.java 0 additions, 7 deletions...savoirfairelinux/sflphone/client/SFLphoneApplication.java
- src/com/savoirfairelinux/sflphone/client/receiver/AccountListReceiver.java 25 additions, 26 deletions...relinux/sflphone/client/receiver/AccountListReceiver.java
- src/com/savoirfairelinux/sflphone/client/receiver/CallListReceiver.java 3 additions, 3 deletions...fairelinux/sflphone/client/receiver/CallListReceiver.java
- src/com/savoirfairelinux/sflphone/fragments/CallElementListFragment.java 64 additions, 26 deletions...airelinux/sflphone/fragments/CallElementListFragment.java
- src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java 1 addition, 5 deletions...oirfairelinux/sflphone/fragments/ContactListFragment.java
- src/com/savoirfairelinux/sflphone/model/SipCall.java 30 additions, 76 deletionssrc/com/savoirfairelinux/sflphone/model/SipCall.java
- src/com/savoirfairelinux/sflphone/service/ISipClient.aidl 6 additions, 0 deletionssrc/com/savoirfairelinux/sflphone/service/ISipClient.aidl
- src/com/savoirfairelinux/sflphone/service/ISipService.aidl 3 additions, 0 deletionssrc/com/savoirfairelinux/sflphone/service/ISipService.aidl
- src/com/savoirfairelinux/sflphone/service/SipService.java 86 additions, 45 deletionssrc/com/savoirfairelinux/sflphone/service/SipService.java
Loading
Please register or sign in to comment