Merge branch 'use-libfm'
authorAndriy Grytsenko <andrej@rep.kiev.ua>
Sat, 15 Feb 2014 11:51:29 +0000 (13:51 +0200)
committerAndriy Grytsenko <andrej@rep.kiev.ua>
Sat, 15 Feb 2014 11:51:29 +0000 (13:51 +0200)
commit89930ab6d52985dacad6ce9258d226c94346a159
treeb4655d7e330b301963432ab696f8d3cf67b54efc
parent2e6b354c7246a7d70d10b9a71f346dd662c33dcc
parent7969be34a0553d00d9c9bd115aa35a7ace0e4bc7
Merge branch 'use-libfm'

Conflicts:
src/plugin.h
data/Makefile.am
src/plugin.c
src/plugins/xkb/xkb-plugin.c
src/plugins/xkb/xkb.h
src/private.h