Changeset 70:fb977138a844 in rrlib_logging


Ignore:
Timestamp:
02.01.2012 15:19:56 (8 years ago)
Author:
Tobias Föhst <foehst@…>
Branch:
default
Parents:
66:2c5c7ccc44a5 (diff), 67:cc92483f226b (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.
Phase:
public
Message:

Merged with adaptions to changed in rrlib_util from branch implicit_log_domains

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • test/test_messages.cpp

    r65 r70  
    4242} 
    4343 
    44 #include "rrlib/util/stl_container/join.h" 
     44#include "rrlib/util/join.h" 
    4545 
    4646//---------------------------------------------------------------------- 
  • test/test_messages.cpp

    r67 r70  
    33// Robotics Research Library 
    44// 
    5 // Copyright (C) AG Robotersysteme TU Kaiserslautern 
     5// Copyright (C) Finroc GbR (finroc.org) 
    66// 
    77// This program is free software; you can redistribute it and/or 
Note: See TracChangeset for help on using the changeset viewer.