summaryrefslogtreecommitdiff
path: root/support/ultraedit
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2005-06-14 17:16:41 +0000
committermichelou <michelou@epfl.ch>2005-06-14 17:16:41 +0000
commitc27b04348a46df90feedbdee8842da91729ebb5a (patch)
tree025e7b9a91d14208878af62b63bdb4c45a5d9570 /support/ultraedit
parented271f43796435097e1e262ac77d291082be99f4 (diff)
downloadscala-c27b04348a46df90feedbdee8842da91729ebb5a.tar.gz
scala-c27b04348a46df90feedbdee8842da91729ebb5a.tar.bz2
scala-c27b04348a46df90feedbdee8842da91729ebb5a.zip
- added 'implicit' and 'match' keywords.
Diffstat (limited to 'support/ultraedit')
-rw-r--r--support/ultraedit/scala.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/support/ultraedit/scala.txt b/support/ultraedit/scala.txt
index c44e70a3d9..3aa358bea4 100644
--- a/support/ultraedit/scala.txt
+++ b/support/ultraedit/scala.txt
@@ -11,7 +11,8 @@ case catch class
def do
else extends
false final finally for
-if import
+if implicit import
+match
new null
object override
package private protected