Changeset 76b5a95c in mainline for uspace/app/sbi/src/lex_t.h


Ignore:
Timestamp:
2011-03-23T20:53:30Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
71af5a4
Parents:
5716e9a (diff), ab10b842 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/sbi/src/lex_t.h

    r5716e9a r76b5a95c  
    11/*
    2  * Copyright (c) 2010 Jiri Svoboda
     2 * Copyright (c) 2011 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    8585        lc_string,
    8686        lc_struct,
     87        lc_switch,
    8788        lc_then,
    8889        lc_this,
    … …  
    9091        lc_var,
    9192        lc_with,
     93        lc_when,
    9294        lc_while,
    9395        lc_yield,
Note: See TracChangeset for help on using the changeset viewer.