diff options
author | Boram Park <boram1288.park@samsung.com> | 2014-04-10 08:06:40 +0900 |
---|---|---|
committer | Boram Park <boram1288.park@samsung.com> | 2014-04-10 08:06:40 +0900 |
commit | e9241e0100fd0a96d01adc52a0499b8d1ffd56fd (patch) | |
tree | 11ae9574bf8842213991eef807c615809bde42ff /packaging/xinit.spec | |
parent | d7fbb5c11b41bb71b9173daea2f48d855bc61316 (diff) | |
parent | d5a674d26d1b4ed377fe98c403f77f3f21bbb473 (diff) | |
download | xinit-e9241e0100fd0a96d01adc52a0499b8d1ffd56fd.tar.gz xinit-e9241e0100fd0a96d01adc52a0499b8d1ffd56fd.tar.bz2 xinit-e9241e0100fd0a96d01adc52a0499b8d1ffd56fd.zip |
Merge branch 'upstream' into tizen
Conflicts:
xinit.c
Change-Id: I4668d4946e67be9aad2568b6a0ef56cb40c3bda1
Diffstat (limited to 'packaging/xinit.spec')
0 files changed, 0 insertions, 0 deletions