Merging branches/new-icons with trunk

Big big thanks to nox-Hand for those great Icons!

diff --git a/src/icons/quassel-icon-active.png b/src/icons/quassel-icon-active.png
index 816a101..1c4d1fc 100644 (file)
Binary files a/src/icons/quassel-icon-active.png and b/src/icons/quassel-icon-active.png differ

diff --git a/src/icons/quassel-icon-offline.png b/src/icons/quassel-icon-offline.png
index 16b0282..2bb7206 100644 (file)
Binary files a/src/icons/quassel-icon-offline.png and b/src/icons/quassel-icon-offline.png differ

diff --git a/src/icons/quassel-icon.png b/src/icons/quassel-icon.png
index 5e438ef..1cd5a04 100644 (file)
Binary files a/src/icons/quassel-icon.png and b/src/icons/quassel-icon.png differ

diff --git a/src/icons/quassel.icns b/src/icons/quassel.icns
index 6ee3117..88652ca 100644 (file)
Binary files a/src/icons/quassel.icns and b/src/icons/quassel.icns differ

diff --git a/src/icons/quassel.ico b/src/icons/quassel.ico
index 8872b36..ede8150 100644 (file)
Binary files a/src/icons/quassel.ico and b/src/icons/quassel.ico differ

diff --git a/src/icons/quassel_icons_rc/128.png b/src/icons/quassel_icons_rc/128.png
new file mode 100755 (executable)
index 0000000..1cd5a04
Binary files /dev/null and b/src/icons/quassel_icons_rc/128.png differ

diff --git a/src/icons/quassel_icons_rc/16.png b/src/icons/quassel_icons_rc/16.png
new file mode 100755 (executable)
index 0000000..03d13f8
Binary files /dev/null and b/src/icons/quassel_icons_rc/16.png differ

diff --git a/src/icons/quassel_icons_rc/24.png b/src/icons/quassel_icons_rc/24.png
new file mode 100755 (executable)
index 0000000..65e53a2
Binary files /dev/null and b/src/icons/quassel_icons_rc/24.png differ

diff --git a/src/icons/quassel_icons_rc/256.png b/src/icons/quassel_icons_rc/256.png
new file mode 100755 (executable)
index 0000000..90375cc
Binary files /dev/null and b/src/icons/quassel_icons_rc/256.png differ

diff --git a/src/icons/quassel_icons_rc/32.png b/src/icons/quassel_icons_rc/32.png
new file mode 100755 (executable)
index 0000000..33b8502
Binary files /dev/null and b/src/icons/quassel_icons_rc/32.png differ

diff --git a/src/icons/quassel_icons_rc/48.png b/src/icons/quassel_icons_rc/48.png
new file mode 100755 (executable)
index 0000000..941a0d8
Binary files /dev/null and b/src/icons/quassel_icons_rc/48.png differ

diff --git a/src/icons/quassel_icons_rc/512.png b/src/icons/quassel_icons_rc/512.png
new file mode 100644 (file)
index 0000000..22dce11
Binary files /dev/null and b/src/icons/quassel_icons_rc/512.png differ

diff --git a/src/icons/quassel_icons_rc/64.png b/src/icons/quassel_icons_rc/64.png
new file mode 100755 (executable)
index 0000000..ae73b8c
Binary files /dev/null and b/src/icons/quassel_icons_rc/64.png differ

diff --git a/src/icons/quassel_icons_rc/Thumbs.db b/src/icons/quassel_icons_rc/Thumbs.db
new file mode 100755 (executable)
index 0000000..c99c71b
Binary files /dev/null and b/src/icons/quassel_icons_rc/Thumbs.db differ

diff --git a/src/icons/quassel_icons_rc/disconnected/128.png b/src/icons/quassel_icons_rc/disconnected/128.png
new file mode 100755 (executable)
index 0000000..2bb7206
Binary files /dev/null and b/src/icons/quassel_icons_rc/disconnected/128.png differ

diff --git a/src/icons/quassel_icons_rc/disconnected/16.png b/src/icons/quassel_icons_rc/disconnected/16.png
new file mode 100755 (executable)
index 0000000..d4b3263
Binary files /dev/null and b/src/icons/quassel_icons_rc/disconnected/16.png differ

diff --git a/src/icons/quassel_icons_rc/disconnected/24.png b/src/icons/quassel_icons_rc/disconnected/24.png
new file mode 100755 (executable)
index 0000000..927f81d
Binary files /dev/null and b/src/icons/quassel_icons_rc/disconnected/24.png differ

diff --git a/src/icons/quassel_icons_rc/disconnected/256.png b/src/icons/quassel_icons_rc/disconnected/256.png
new file mode 100755 (executable)
index 0000000..278b784
Binary files /dev/null and b/src/icons/quassel_icons_rc/disconnected/256.png differ

diff --git a/src/icons/quassel_icons_rc/disconnected/32.png b/src/icons/quassel_icons_rc/disconnected/32.png
new file mode 100755 (executable)
index 0000000..8ecc091
Binary files /dev/null and b/src/icons/quassel_icons_rc/disconnected/32.png differ

diff --git a/src/icons/quassel_icons_rc/disconnected/48.png b/src/icons/quassel_icons_rc/disconnected/48.png
new file mode 100755 (executable)
index 0000000..3586013
Binary files /dev/null and b/src/icons/quassel_icons_rc/disconnected/48.png differ

diff --git a/src/icons/quassel_icons_rc/disconnected/512.png b/src/icons/quassel_icons_rc/disconnected/512.png
new file mode 100755 (executable)
index 0000000..a84e2cb
Binary files /dev/null and b/src/icons/quassel_icons_rc/disconnected/512.png differ

diff --git a/src/icons/quassel_icons_rc/disconnected/64.png b/src/icons/quassel_icons_rc/disconnected/64.png
new file mode 100755 (executable)
index 0000000..2ceb3b5
Binary files /dev/null and b/src/icons/quassel_icons_rc/disconnected/64.png differ

diff --git a/src/icons/quassel_icons_rc/ico_version/128.ico b/src/icons/quassel_icons_rc/ico_version/128.ico
new file mode 100755 (executable)
index 0000000..ede8150
Binary files /dev/null and b/src/icons/quassel_icons_rc/ico_version/128.ico differ

diff --git a/src/icons/quassel_icons_rc/ico_version/16.ico b/src/icons/quassel_icons_rc/ico_version/16.ico
new file mode 100755 (executable)
index 0000000..b90f11c
Binary files /dev/null and b/src/icons/quassel_icons_rc/ico_version/16.ico differ

diff --git a/src/icons/quassel_icons_rc/ico_version/24.ico b/src/icons/quassel_icons_rc/ico_version/24.ico
new file mode 100755 (executable)
index 0000000..6aee4d3
Binary files /dev/null and b/src/icons/quassel_icons_rc/ico_version/24.ico differ

diff --git a/src/icons/quassel_icons_rc/ico_version/256.ico b/src/icons/quassel_icons_rc/ico_version/256.ico
new file mode 100755 (executable)
index 0000000..2e7d739
Binary files /dev/null and b/src/icons/quassel_icons_rc/ico_version/256.ico differ

diff --git a/src/icons/quassel_icons_rc/ico_version/32.ico b/src/icons/quassel_icons_rc/ico_version/32.ico
new file mode 100755 (executable)
index 0000000..697a244
Binary files /dev/null and b/src/icons/quassel_icons_rc/ico_version/32.ico differ

diff --git a/src/icons/quassel_icons_rc/ico_version/48.ico b/src/icons/quassel_icons_rc/ico_version/48.ico
new file mode 100755 (executable)
index 0000000..7d064ca
Binary files /dev/null and b/src/icons/quassel_icons_rc/ico_version/48.ico differ

diff --git a/src/icons/quassel_icons_rc/ico_version/64.ico b/src/icons/quassel_icons_rc/ico_version/64.ico
new file mode 100755 (executable)
index 0000000..f3a585e
Binary files /dev/null and b/src/icons/quassel_icons_rc/ico_version/64.ico differ

diff --git a/src/icons/quassel_icons_rc/newmessage/128.png b/src/icons/quassel_icons_rc/newmessage/128.png
new file mode 100755 (executable)
index 0000000..1c4d1fc
Binary files /dev/null and b/src/icons/quassel_icons_rc/newmessage/128.png differ

diff --git a/src/icons/quassel_icons_rc/newmessage/16.png b/src/icons/quassel_icons_rc/newmessage/16.png
new file mode 100755 (executable)
index 0000000..786f112
Binary files /dev/null and b/src/icons/quassel_icons_rc/newmessage/16.png differ

diff --git a/src/icons/quassel_icons_rc/newmessage/24.png b/src/icons/quassel_icons_rc/newmessage/24.png
new file mode 100755 (executable)
index 0000000..6b722e2
Binary files /dev/null and b/src/icons/quassel_icons_rc/newmessage/24.png differ

diff --git a/src/icons/quassel_icons_rc/newmessage/256.png b/src/icons/quassel_icons_rc/newmessage/256.png
new file mode 100755 (executable)
index 0000000..12b65c1
Binary files /dev/null and b/src/icons/quassel_icons_rc/newmessage/256.png differ

diff --git a/src/icons/quassel_icons_rc/newmessage/32.png b/src/icons/quassel_icons_rc/newmessage/32.png
new file mode 100755 (executable)
index 0000000..897be7c
Binary files /dev/null and b/src/icons/quassel_icons_rc/newmessage/32.png differ

diff --git a/src/icons/quassel_icons_rc/newmessage/48.png b/src/icons/quassel_icons_rc/newmessage/48.png
new file mode 100755 (executable)
index 0000000..ed283e8
Binary files /dev/null and b/src/icons/quassel_icons_rc/newmessage/48.png differ

diff --git a/src/icons/quassel_icons_rc/newmessage/512.png b/src/icons/quassel_icons_rc/newmessage/512.png
new file mode 100755 (executable)
index 0000000..79085c4
Binary files /dev/null and b/src/icons/quassel_icons_rc/newmessage/512.png differ

diff --git a/src/icons/quassel_icons_rc/newmessage/64.png b/src/icons/quassel_icons_rc/newmessage/64.png
new file mode 100755 (executable)
index 0000000..806262e
Binary files /dev/null and b/src/icons/quassel_icons_rc/newmessage/64.png differ

diff --git a/src/icons/quassel_icons_rc/quassel.icns b/src/icons/quassel_icons_rc/quassel.icns
new file mode 100644 (file)
index 0000000..88652ca
Binary files /dev/null and b/src/icons/quassel_icons_rc/quassel.icns differ

diff --git a/version.inc b/version.inc
index 44f0891..63cd1a0 100644 (file)
--- a/version.inc
+++ b/version.inc
@@ -5,7 +5,7 @@
 
   quasselVersion = "0.3.0-pre";
   quasselDate = "2008-05-30";
-  quasselBuild = 866;
+  quasselBuild = 869;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 731;