OSDN Git Service

resolved conflicts for merge of 6dd2ae02 to eclair
-rw-r--r-- 3870 buildspec.mk.default
-rw-r--r-- 4844 cleanspec.mk
drwxr-xr-x - core
-rw-r--r-- 27250 envsetup.sh
drwxr-xr-x - history
drwxr-xr-x - libs
drwxr-xr-x - target
drwxr-xr-x - tools