diff options
| author | Jaeyun Jeong <jyjeong@samsung.com> | 2013-01-16 19:28:22 +0900 |
|---|---|---|
| committer | Jaeyun Jeong <jyjeong@samsung.com> | 2013-01-16 19:28:22 +0900 |
| commit | 8d23c49ed85da473230460880e04a357e39569ab (patch) | |
| tree | 5cb0aa66920d5d0f54c787cde0f91fd2209d59b2 /main | |
| parent | 66b51242099470c68d88c245fa9c0f99a05d2816 (diff) | |
| parent | 50fe3bcdd5a31c3a5be11133cdf4444f18fb04c2 (diff) | |
| download | message-app-8d23c49ed85da473230460880e04a357e39569ab.tar.gz message-app-8d23c49ed85da473230460880e04a357e39569ab.tar.bz2 message-app-8d23c49ed85da473230460880e04a357e39569ab.zip | |
Merge branch 'master' into tizen_2.0
Conflicts:
packaging/org.tizen.message.spec
> Conflicts is fixed.
Change-Id: Ie5900ab13b3ae54b45500df9e193d3251f882afb
Diffstat (limited to 'main')
0 files changed, 0 insertions, 0 deletions