| commit | 398ce1b4cf9ad61333cb7274862a96a6a7411020 | [log] [tgz] |
|---|---|---|
| author | Alexandre Savard <alexandre.savard@savoirfairelinux.com> | Wed Sep 12 17:34:41 2012 -0400 |
| committer | Alexandre Savard <alexandre.savard@savoirfairelinux.com> | Wed Sep 12 17:34:41 2012 -0400 |
| tree | b9e1355b51fbfc30eabe7dfe79dcb009ea808877 | |
| parent | def3bfa2214966df69bfc8e703e237a05e210631 [diff] | |
| parent | c30b71d4bb206c63610921bf33378b51cfef9338 [diff] |
Merge branch 'master' of git.savoirfairelinux.com:sflphone-android Conflicts: src/com/savoirfairelinux/sflphone/client/ManagerImpl.java src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java