OSDN Git Service

resolved conflicts for merge of 71c8cbb7 to master
drwxr-xr-x - res
drwxr-xr-x - src