Changeset 158:b9ff329accda in rrlib_util


Ignore:
Timestamp:
07.09.2017 11:54:47 (2 years ago)
Author:
Tobias Föhst <foehst@…>
Branch:
default
Parents:
151:348ae4187df0 (diff), 156:030a1ef23ba0 (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:

Merge with 14.08

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • tests/make.xml

    r142 r157  
    77  <program name="string" sources="string.cpp" /> 
    88  <program name="fileio" sources="fileio.cpp" /> 
     9  <program name="time" sources="time.cpp" /> 
    910 
    1011</targets> 
  • tests/make.xml

    r156 r157  
    66  <program name="tagged_pointer" sources="tagged_pointer.cpp" /> 
    77  <program name="string" sources="string.cpp" /> 
     8  <program name="fileio" sources="fileio.cpp" /> 
    89  <program name="time" sources="time.cpp" /> 
    910 
Note: See TracChangeset for help on using the changeset viewer.