summaryrefslogtreecommitdiff
path: root/src/reflect
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2016-06-01 10:20:59 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2016-06-01 10:20:59 +0200
commit20dd825ec6b5d4015ce36cf4373ba1c1d917da94 (patch)
tree8853ed0b590f37607fdedaed36a74ca6fada34c8 /src/reflect
parent697158414f563a9b43ada696a1bb949eab96208b (diff)
parentcba585d41b9c2c47f256cbce45115bb205ae58a2 (diff)
downloadscala-20dd825ec6b5d4015ce36cf4373ba1c1d917da94.tar.gz
scala-20dd825ec6b5d4015ce36cf4373ba1c1d917da94.tar.bz2
scala-20dd825ec6b5d4015ce36cf4373ba1c1d917da94.zip
Merge commit 'cba585d' into merge-2.11-to-2.12-june-1
Diffstat (limited to 'src/reflect')
-rw-r--r--src/reflect/scala/reflect/internal/StdNames.scala1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/reflect/scala/reflect/internal/StdNames.scala b/src/reflect/scala/reflect/internal/StdNames.scala
index c93ecac3fa..20a485469d 100644
--- a/src/reflect/scala/reflect/internal/StdNames.scala
+++ b/src/reflect/scala/reflect/internal/StdNames.scala
@@ -240,6 +240,7 @@ trait StdNames {
final val Any: NameType = "Any"
final val AnyVal: NameType = "AnyVal"
+ final val App: NameType = "App"
final val FlagSet: NameType = "FlagSet"
final val Mirror: NameType = "Mirror"
final val Modifiers: NameType = "Modifiers"