Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset e40ece98 in mainline


Ignore:
Timestamp:
2012-05-01T07:58:55Z (10 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master
Children:
9fc72fb3
Parents:
296ef5d6 (diff), d21e935c (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 with mainline

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • HelenOS.config

    r296ef5d6 re40ece98  
    556556
    557557% Include development files (headers, libraries)
    558 ! [RDFMT=tmpfs|RDFMT=ext2fs] CONFIG_DEVEL_FILES (n/y)
     558! CONFIG_DEVEL_FILES (n/y)
    559559
    560560% Strip binaries
  • kernel/genarch/src/fb/fb.c

    r296ef5d6 re40ece98  
    390390                            instance->position / instance->cols, false);
    391391                        instance->position++;
    392                 } while ((instance->position % 8)
    393                     && (instance->position < instance->cols * instance->rows));
     392                } while (((instance->position % instance->cols) % 8 != 0) &&
     393                    (instance->position < instance->cols * instance->rows));
    394394                break;
    395395        default:
  • uspace/app/inetcfg/inetcfg.c

    r296ef5d6 re40ece98  
    3535 */
    3636
    37 #include <async.h>
    3837#include <errno.h>
    3938#include <inet/inetcfg.h>
Note: See TracChangeset for help on using the changeset viewer.