Changeset 2662 for code/trunk/src/core/XMLIncludes.h
- Timestamp:
- Feb 14, 2009, 10:17:35 PM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/core/XMLIncludes.h
- Property svn:mergeinfo changed
/code/branches/network/src/core/XMLIncludes.h (added) merged: 2356 /code/branches/physics/src/core/XMLIncludes.h (added) merged: 2192 /code/branches/physics_merge/src/core/XMLIncludes.h (added) merged: 2442 /code/branches/pickups2/src/core/XMLIncludes.h (added) merged: 2136 /code/branches/presentation/src/core/XMLIncludes.h (added) merged: 2371,2420,2459,2485,2492-2493,2500,2539
r2261 r2662 64 64 namespace orxonox 65 65 { 66 typedef ticpp::DocumentDocument;67 typedef ticpp::ElementElement;68 typedef ticpp::DeclarationDeclaration;69 typedef ticpp::StylesheetReferenceStylesheetReference;70 typedef ticpp::TextText;71 typedef ticpp::CommentComment;72 typedef ticpp::AttributeAttribute;66 using ticpp::Document; 67 using ticpp::Element; 68 using ticpp::Declaration; 69 using ticpp::StylesheetReference; 70 using ticpp::Text; 71 using ticpp::Comment; 72 using ticpp::Attribute; 73 73 } - Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.