Try to automerge with this, haha

2010-09-27 12:55:39 +02:00 · 2010-09-27 12:55:39 +02:00 · 07283c6f55
commit 07283c6f55
parent 99e2782ebc
7 changed files with 0 additions and 2 deletions
--- a/Resources/Font-Data
+++ b/Resources/Font-Data
--- a/Resources/Font-Pointers
+++ b/Resources/Font-Pointers
--- a/Resources/Icon-16.png
+++ b/Resources/Icon-16.png
--- a/Resources/Icon-32.png
+++ b/Resources/Icon-32.png
--- a/Resources/powder-res.rc
+++ b/Resources/powder-res.rc
@ -1,2 +0,0 @@
-#define IDI_ICON1 101
-IDI_ICON1 ICON DISCARDABLE "powder.ico"
--- a/Resources/powder.icns
+++ b/Resources/powder.icns
--- a/Resources/powder.ico
+++ b/Resources/powder.ico