summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/palemoon/config/version.txt2
-rw-r--r--xpcom/io/nsLocalFileWin.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/application/palemoon/config/version.txt b/application/palemoon/config/version.txt
index bcbf0fd12..2f872202e 100644
--- a/application/palemoon/config/version.txt
+++ b/application/palemoon/config/version.txt
@@ -1 +1 @@
-28.6.0a1 \ No newline at end of file
+28.6.0 \ No newline at end of file
diff --git a/xpcom/io/nsLocalFileWin.cpp b/xpcom/io/nsLocalFileWin.cpp
index e73e15950..23c283f95 100644
--- a/xpcom/io/nsLocalFileWin.cpp
+++ b/xpcom/io/nsLocalFileWin.cpp
@@ -3034,6 +3034,7 @@ nsLocalFile::IsExecutable(bool* aResult)
"ins",
"isp",
"jar", // java application bundle
+ "jnlp", // java web start
"js",
"jse",
"lnk",