# HG changeset patch # User mf0102 <0102@gmx.at> # Date 1193480187 -7200 # Node ID 6ee9576ba8c65306e991613eceecd0508e9bc7c8 # Parent 5b11347673a5f58c73b83c235ae97e4d9a7473af# Parent 5c7799639f9fd90cddac424d7f25094f891162b5 automated merge diff -r 5b11347673a5 -r 6ee9576ba8c6 Skins/Classic/.depend diff -r 5b11347673a5 -r 6ee9576ba8c6 Skins/Classic/.depend-done diff -r 5b11347673a5 -r 6ee9576ba8c6 Skins/Classic1.3/.depend diff -r 5b11347673a5 -r 6ee9576ba8c6 Skins/Classic1.3/.depend-done diff -r 5b11347673a5 -r 6ee9576ba8c6 Skins/Default/.depend diff -r 5b11347673a5 -r 6ee9576ba8c6 Skins/Default/.depend-done diff -r 5b11347673a5 -r 6ee9576ba8c6 Skins/Ivory/.depend diff -r 5b11347673a5 -r 6ee9576ba8c6 Skins/Ivory/.depend-done diff -r 5b11347673a5 -r 6ee9576ba8c6 Skins/Osmosis/.depend diff -r 5b11347673a5 -r 6ee9576ba8c6 Skins/Osmosis/.depend-done diff -r 5b11347673a5 -r 6ee9576ba8c6 Skins/TinyPlayer/.depend diff -r 5b11347673a5 -r 6ee9576ba8c6 Skins/TinyPlayer/.depend-done diff -r 5b11347673a5 -r 6ee9576ba8c6 pixmaps/.depend diff -r 5b11347673a5 -r 6ee9576ba8c6 pixmaps/.depend-done