Merge remote-tracking branch 'origin/develop'

atkhalsa · Nov 5, 2012 · 1e94c97 · 1e94c97
2 parents db9f3e0 + a543d7a
commit 1e94c97
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
@@ -51,9 +51,9 @@
 [assembly: AssemblyCopyright("2010 Patrick 'Ricky' Smith (www.ricky-dev.com)")]
 [assembly: AssemblyTrademark("")]
 
-[assembly: AssemblyVersion("2.4.1.*")]
-[assembly: AssemblyFileVersion("2.4.1.0")]
-[assembly: AssemblyInformationalVersion("2.4.1")]
+[assembly: AssemblyVersion("2.4.2.*")]
+[assembly: AssemblyFileVersion("2.4.2.0")]
+[assembly: AssemblyInformationalVersion("2.4.2")]
 
 #if !SILVERLIGHT
 [assembly: AllowPartiallyTrustedCallers]

diff --git a/Twitterizer2.Streaming/Location.cs b/Twitterizer2.Streaming/Location.cs
@@ -6,13 +6,13 @@ public class Location
         /// Gets or sets the latitude.
         /// </summary>
         /// <value>The latitude.</value>
-        public int Latitude { get; set; }
+        public double Latitude { get; set; }
 
         /// <summary>
         /// Gets or sets the longitude.
         /// </summary>
         /// <value>The longitude.</value>
-        public int Longitude { get; set; }
+        public double Longitude { get; set; }
 
         /// <summary>
         /// Returns a <see cref="System.String"/> that represents this instance.
@@ -22,7 +22,7 @@ public class Location
         /// </returns>
         public override string ToString()
         {
-            return string.Format("{0},{1}", this.Latitude, this.Longitude);
+            return string.Format(System.Globalization.CultureInfo.InvariantCulture, "{0},{1}", this.Longitude, this.Latitude);
         }
     }
 }
diff --git a/lib/NuGet.exe b/lib/NuGet.exe
diff --git a/twitterizer.nuspec b/twitterizer.nuspec
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
-    <version>2.4.1.1</version>
+    <version>2.4.2.0</version>
     <authors>digitallyborn</authors>
     <owners>Ricky Smith</owners>
     <licenseUrl>http://www.twitterizer.net/license/</licenseUrl>
     <projectUrl>http://www.twitterizer.net</projectUrl>
     <iconUrl>http://www.twitterizer.net/twitterizer-icon-draft1.png</iconUrl>
     <dependencies>
-      <dependency id="Newtonsoft.Json" version="[4.5.5]" />
+      <dependency id="Newtonsoft.Json" />
     </dependencies>
     <id>twitterizer</id>
     <title>Twitterizer</title>