rvandegrift
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflict. 

Signed-off-by: Sanjeev BA <as2902.b@samsung.com>

SVN revision: 64723
This commit is contained in:
Sanjeev BA 2011-11-04 12:12:16 +00:00 committed by Sanjeev BA
parent dddc8048c0
commit d34d507579
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/elementary/AUTHORS
View File

@ -48,3 +48,4 @@ Guillaume "Kuri" Friloux <guillaume.friloux@asp64.com>
Kim Yunhan <spbear@gmail.com>
Bluezery <ohpowel@gmail.com>
Nicolas Aguirre <aguirre.nicolas@gmail.com>
Sanjeev BA <iamsanjeev@gmail.com>