Changeset 985e26d2 in mainline for uspace/srv/clip/clip.h


Ignore:
Timestamp:
2010-01-07T19:06:59Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8190e63
Parents:
743e17b (diff), eca2435 (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 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/clip/clip.h

    r743e17b r985e26d2  
    11/*
    2  * Copyright (c) 2005 Jakub Jermar
     2 * Copyright (c) 2009 Martin Decky
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 /** @addtogroup ia64   
    30  * @{
    31  */
    32 /** @file
    33  */
    34 
    35 #ifndef KERN_ia64_ARG_H_
    36 #define KERN_ia64_ARG_H_
    37 
    38 #include <stdarg.h>
     29#ifndef CLIP_MAIN_H_
     30#define CLIP_MAIN_H_
    3931
    4032#endif
    41 
    42 /** @}
    43  */
Note: See TracChangeset for help on using the changeset viewer.