From caea8b1d17d7b0866e9f3382415d5153d1e122ce Mon Sep 17 00:00:00 2001
From: Ross Johnson <ross@mazira.com>
Date: Tue, 28 Feb 2012 13:19:28 -0600
Subject: Fixed clobbering of global variable 'o'

---
 jquery-ui-timepicker-addon.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index 4c0be70..fee9769 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -314,7 +314,7 @@ $.extend(Timepicker.prototype, {
 	// pattern for standard and localized AM/PM markers
 	//########################################################################
 	_getPatternAmpm: function() {
-		var markers = [];
+		var markers = [],
 			o = this._defaults;
 		if (o.amNames)
 			$.merge(markers, o.amNames);
-- 
cgit v1.1