Steven Armstrong a50e380174 fix merge conflict ... Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>		2011-03-14 09:26:18 +01:00
..
explorer	update explorer for __package_apt and install only if not already installed (same for deinstall)	2011-03-03 09:12:55 +01:00
parameter	add template for __package_apt	2011-03-02 18:37:15 +01:00
gencode	fix merge conflict	2011-03-14 09:26:18 +01:00