Merge branch 'master' of git://172.21.111.188/emulator
authorsyeon.hwang <syeon.hwang@samsung.com>
Thu, 8 Mar 2012 06:36:52 +0000 (15:36 +0900)
committersyeon.hwang <syeon.hwang@samsung.com>
Thu, 8 Mar 2012 06:36:52 +0000 (15:36 +0900)
1  2 
tizen/src/Makefile.tizen
vl.c

Simple merge
diff --cc vl.c
index 93a2f3a,df03a88..1d54e3f
mode 100644,100755..100755
--- 1/vl.c
--- 2/vl.c
+++ b/vl.c