Changeset 3364

Show
Ignore:
Timestamp:
06/14/08 19:06:25 (3 months ago)
Author:
dgollub
Message:

Undo r3362. Files got copied instead of moved. Avoid losing of revision
logs.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/formats/plain.c

    r3362 r3364  
    2424#include <opensync/opensync-serializer.h> 
    2525#include <opensync/opensync-format.h> 
    26 #include <opensync/opensync-xmlformat.h> 
     26#include <opensync/opensync-merger.h> 
    2727#include <glib.h> 
    2828 

  • trunk/formats/xmlformat-doc.c

    r3362 r3364  
    2424#include <opensync/opensync.h> 
    2525#include <opensync/opensync_internals.h> 
    26 #include <opensync/opensync-xmlformat.h> 
     26#include <opensync/opensync-merger.h> 
    2727#include <opensync/opensync-format.h> 
    2828 

  • trunk/formats/xmlformat.h

    r3362 r3364  
    3030#include <opensync/opensync.h> 
    3131#include <opensync/opensync_internals.h> 
    32 #include <opensync/opensync-xmlformat.h> 
     32#include <opensync/opensync-merger.h> 
    3333#include <opensync/opensync-serializer.h> 
    3434#include <opensync/opensync-format.h> 

  • trunk/opensync/CMakeLists.txt

    r3362 r3364  
    4444   merger/opensync_capability.c 
    4545   merger/opensync_merger.c 
    46    xmlformat/opensync_xmlfield.c 
    47    xmlformat/opensync_xmlfieldlist.c 
    48    xmlformat/opensync_xmlformat.c 
     46   merger/opensync_xmlfield.c 
     47   merger/opensync_xmlfieldlist.c 
     48   merger/opensync_xmlformat.c 
    4949   module/opensync_module.c 
    5050   plugin/opensync_plugin_authentication.c 
    …… 
    8686  mapping 
    8787  merger 
    88   xmlformat 
    8988  module 
    9089  plugin 
    …… 
    111110   opensync-mapping.h 
    112111   opensync-merger.h 
    113    opensync-xmlformat.h 
    114112   opensync-module.h 
    115113   opensync-plugin.h 

  • trunk/opensync/engine/opensync_engine.c

    r3362 r3364  
    3131#include "opensync-archive.h" 
    3232#include "opensync-merger.h" 
    33 #include "opensync-xmlformat.h" 
    3433 
    3534#include "opensync_obj_engine.h" 

  • trunk/opensync/merger/opensync-merger_internals.h

    r3362 r3364  
    2828#include "opensync_capabilities_internals.h" 
    2929#include "opensync_capability_internals.h" 
     30#include "opensync_xmlformat_internals.h" 
     31#include "opensync_xmlfield_internals.h" 
     32#include "opensync_xmlfieldlist_internals.h" 
    3033#include "opensync_merger_internals.h" 
    3134 

  • trunk/opensync/merger/opensync_merger.c

    r3362 r3364  
    2626#include "opensync-merger.h" 
    2727#include "opensync-merger_internals.h" 
    28  
    29 #include "opensync-xmlformat.h" 
    30 #include "../xmlformat/opensync-xmlformat_internals.h" 
    3128 
    3229/** 

  • trunk/opensync/opensync-merger.h

    r3362 r3364  
    2626#include "merger/opensync_capabilities.h" 
    2727#include "merger/opensync_capability.h" 
     28#include "merger/opensync_xmlformat.h" 
     29#include "merger/opensync_xmlfield.h" 
     30#include "merger/opensync_xmlfieldlist.h" 
    2831#include "merger/opensync_merger.h" 
    2932