Changeset 03362fbd in mainline for version


Ignore:
Timestamp:
2013-02-09T23:14:45Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
22dfd38
Parents:
b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • version

    rb5d2e57 r03362fbd  
    3636
    3737VERSION = 0
    38 PATCHLEVEL = 4
    39 SUBLEVEL = 3
     38PATCHLEVEL = 5
     39SUBLEVEL = 0
    4040
    4141ifdef EXTRAVERSION
    … …  
    4545endif
    4646
    47 NAME = Sashimi
     47NAME = Fajtl
    4848COPYRIGHT = Copyright (c) 2001-2012 HelenOS project
Note: See TracChangeset for help on using the changeset viewer.