Steven Armstrong 59e774b08d fix merge conflict in changelog ... Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>		2011-03-16 14:41:43 +01:00
..
explorer	finish __package_pacman	2011-03-02 21:23:43 +01:00
parameter	finish __package_pacman	2011-03-02 21:23:43 +01:00
gencode	/deinstalled/uninstalled/	2011-03-03 10:37:49 +01:00
man.text	[DOC] __package_pacman gained manpage	2011-03-14 23:23:32 +01:00