Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

This commit is contained in:
Marco Pesenti Gritti 2007-08-08 11:53:41 +02:00
commit 1d297b3376

View File

@ -64,7 +64,7 @@ services/console/Makefile
services/console/interface/Makefile services/console/interface/Makefile
services/console/interface/xo/Makefile services/console/interface/xo/Makefile
services/console/interface/memphis/plugins/clean_size/Makefile services/console/interface/memphis/plugins/clean_size/Makefile
services/console/interface/memphis/plugins/dirty_size/Makefile services/console/interface/memphis/plugins/smaps/Makefile
services/console/interface/memphis/plugins/Makefile services/console/interface/memphis/plugins/Makefile
services/console/interface/memphis/plugins/memphis_init/Makefile services/console/interface/memphis/plugins/memphis_init/Makefile
services/console/interface/memphis/plugins/cpu/Makefile services/console/interface/memphis/plugins/cpu/Makefile