Changeset 295 for ruby

Timestamp:

Sep 24, 2009, 8:38:01 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

merge error

Location:

ruby/trunk

Files:

• Rakefile (copied) (copied from ruby/branches/0.5/Rakefile )
• lib/open_ehr (copied) (copied from ruby/trunk/lib/open_ehr )
• lib/open_ehr/rm/common/directory.rb (modified) (2 diffs, 1 prop)
• lib/open_ehr/rm/support/measurement.rb (modified) (1 diff, 1 prop)

ruby/trunk/lib/open_ehr/rm/common/directory.rb

@@ -2 +2 @@
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_5_1_76d0249_1140536622627_218703_7149Report.html
 # Ticket refs #63
-include OpenEhr::RM::DataTypes::Text
-module OpenEhr
+include OpenEHR::RM::DataTypes::Text
+module OpenEHR
   module RM
     module Common
       module Directory
-        class Folder < OpenEhr::RM::Common::Archetyped::Locatable
+        class Folder < OpenEHR::RM::Common::Archetyped::Locatable
           attr_accessor :items
           attr_reader :folders
@@ -22 +22 @@
           end
         end        
-        class VersionedFolder < OpenEhr::RM::Common::ChangeControl::VersionedObject
+        class VersionedFolder < OpenEHR::RM::Common::ChangeControl::VersionedObject
         end
       end # of Directory

ruby/trunk/lib/open_ehr/rm/support/measurement.rb

@@ -1 @@
-module OpenEhr
+module OpenEHR
   module RM
     module Support