Makefile: fix conflict resolution
[mplayer/glamo.git] / DOCS / 
tree0aac89bfbbb7a1bd4c59c1bc7a64474137673fb6
drwxr-xr-x   ..
-rw-r--r-- 1001 README
-rw-r--r-- 110 default.css
drwxr-xr-x - man
drwxr-xr-x - tech
drwxr-xr-x - xml