Merge branch 'release-v1.2'

* release-v1.2: Renamed 'unstable' to 'beta'.
pjf · Dec 16, 2014 · 7ca1b81 · 7ca1b81
2 parents 3f3f56c + 58d34f2
commit 7ca1b81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/CKAN/CKAN/Meta.cs b/CKAN/CKAN/Meta.cs
@@ -14,7 +14,7 @@ public static class Meta
         /// <summary>
         /// Returns the version of the CKAN.dll used, complete with git info
         /// and other decorations as filled in by our build system.
-        /// Eg: v1.3.5-12-g055d7c3 (unstable) or "development (unstable)"
+        /// Eg: v1.3.5-12-g055d7c3 (beta) or "development (unstable)"
         /// </summary>
         public static string Version()
         {
@@ -23,7 +23,7 @@ public static string Version()
             #if (STABLE)
             version += " (stable)";
             #else
-            version += " (unstable)";
+            version += " (beta)";
             #endif
 
             return version;
@@ -67,4 +67,4 @@ public static bool IsStable()
             #endif
         }
     }
-}
+}
diff --git a/CKAN/GUI/AboutDialog.Designer.cs b/CKAN/GUI/AboutDialog.Designer.cs