/www/pidgin: ee1240a98935: Merge with no conflicts

[Mark Doliner]

Changeset: ee1240a98935bf0eeeefeeef8ff57aa29a132bc4
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2013-02-13 07:08 -0800
Branch:	 default
URL: http://hg.pidgin.im/www/pidgin/rev/ee1240a98935

Description:

Merge with no conflicts

diffstat:

 htdocs/win32/download_redir.php |  10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diffs (22 lines):

diff --git a/htdocs/win32/download_redir.php b/htdocs/win32/download_redir.php
--- a/htdocs/win32/download_redir.php
+++ b/htdocs/win32/download_redir.php
@@ -4,18 +4,8 @@ if (isset($_GET['dl_pkg'])) {
 	$dl_pkg = $_GET['dl_pkg'];
 	if ($dl_pkg == 'gtk') {
 		$fwd_url = 'http://downloads.sourceforge.net/project/pidgin/GTK%2B%20for%20Windows/' . $_GET['gtk_version'] . '/gtk-runtime-' . $_GET['gtk_version'] . '.zip';
-	} else if ($dl_pkg == 'gtk_sha1sum') {
-		if ($_GET['gtk_version'] == '2.6.16.0') {
-			$body = '253fc4da13fced9c5534d9896c9e43147f41035d';
-		} else if ($_GET['gtk_version'] == '2.6.16.1') {
-			//TODO: $body = '5bf4f6903623d7b2fa2835821ccfdee8c685cbe0';
-		}
 	} else if ($dl_pkg == 'dbgsym') {
 		$fwd_url = 'http://downloads.sourceforge.net/project/pidgin/Pidgin/' . $_GET['version'] . '/pidgin-' . $_GET['version'] . '-dbgsym.zip';
-	} else if ($dl_pkg == 'dbgsym_sha1sum') {
-		if ($_GET['version'] == '2.10.6') {
-			$body = '37bad002895ac2d229a24a7ee154e6140c35034c';
-		}
 	} else if ($dl_pkg == 'oo_dict') {
 		$lang = $_GET['lang'];
 		$lang_file = $_GET['lang_file'];