Merge branch 'master' into prolog-pl-samples

Conflicts:
	lib/linguist/languages.yml
	lib/linguist/samples.json

lib/linguist/languages.yml

@@ -1203,6 +1203,16 @@ LLVM:
   extensions:
   - .ll
 
+LSL:
+  type: programming
+  lexer: LSL
+  ace_mode: lsl
+  extensions:
+  - .lsl
+  interpreters:
+  - lsl
+  color: '#3d9970'
+
 LabVIEW:
   type: programming
   lexer: Text only

lib/linguist/samples.json

@@ -311,6 +311,9 @@
     "LFE": [
       ".lfe"
     ],
+    "LSL": [
+      ".lsl"
+    ],
     "Lasso": [
       ".las",
       ".lasso",
@@ -848,8 +851,8 @@
       "exception.zep.php"
     ]
   },
-  "tokens_total": 659134,
-  "languages_total": 904,
+  "tokens_total": 659332,
+  "languages_total": 905,
   "tokens": {
     "ABAP": {
       "*/**": 1,
@@ -36039,6 +36042,72 @@
       "info": 1,
       "reproduce": 1
     },
+    "LSL": {
+      "integer": 8,
+      "someIntNormal": 2,
+      ";": 29,
+      "someIntHex": 2,
+      "someIntMath": 2,
+      "PI_BY_TWO": 2,
+      "event": 2,
+      "//": 5,
+      "is": 3,
+      "invalid.illegal": 2,
+      "key": 3,
+      "someKeyTexture": 2,
+      "TEXTURE_DEFAULT": 2,
+      "string": 5,
+      "someStringSpecial": 2,
+      "EOF": 2,
+      "some_user_defined_function_without_return_type": 2,
+      "(": 19,
+      "inputAsString": 2,
+      ")": 19,
+      "{": 9,
+      "llSay": 1,
+      "PUBLIC_CHANNEL": 4,
+      "}": 9,
+      "user_defined_function_returning_a_string": 2,
+      "inputAsKey": 2,
+      "return": 1,
+      "default": 2,
+      "state_entry": 2,
+      "someKey": 3,
+      "NULL_KEY": 1,
+      "llGetOwner": 1,
+      "someString": 2,
+      "touch_start": 1,
+      "num_detected": 2,
+      "list": 1,
+      "agentsInRegion": 3,
+      "llGetAgentList": 1,
+      "AGENT_LIST_REGION": 1,
+      "[": 1,
+      "]": 1,
+      "numOfAgents": 2,
+      "llGetListLength": 1,
+      "index": 4,
+      "defaults": 1,
+      "to": 1,
+      "for": 2,
+      "<": 1,
+      "-": 1,
+      "+": 2,
+      "each": 1,
+      "agent": 1,
+      "in": 1,
+      "region": 1,
+      "llRegionSayTo": 1,
+      "llList2Key": 1,
+      "touch_end": 1,
+      "llSetInventoryPermMask": 1,
+      "MASK_NEXT": 1,
+      "PERM_ALL": 1,
+      "reserved.godmode": 1,
+      "llWhisper": 2,
+      "state": 3,
+      "other": 2
+    },
     "Lasso": {
       "<": 7,
       "LassoScript": 1,
@@ -73057,6 +73126,7 @@
     "Kit": 6,
     "Kotlin": 155,
     "LFE": 1711,
+    "LSL": 198,
     "Lasso": 9849,
     "Latte": 759,
     "Less": 39,
@@ -73271,6 +73341,7 @@
     "Kit": 1,
     "Kotlin": 1,
     "LFE": 4,
+    "LSL": 1,
     "Lasso": 4,
     "Latte": 2,
     "Less": 1,
@@ -73397,5 +73468,5 @@
     "fish": 3,
     "wisp": 1
   },
-  "md5": "50b2227d023291a6a909ca3866c171c8"
+  "md5": "3778b7ad7414915c83e6960531006542"
 }