OSDN Git Service

resolved conflicts for merge of 90b35770 to eclair-mr2
-rw-r--r-- 4200 buildspec.mk.default
-rw-r--r-- 8233 cleanspec.mk
drwxr-xr-x - core
-rw-r--r-- 27374 envsetup.sh
drwxr-xr-x - history
drwxr-xr-x - libs
drwxr-xr-x - target
drwxr-xr-x - tools