merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:20:07 +0000 (01:20 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:20:07 +0000 (01:20 +0900)
commit15142ff449df2d42e96861a2637fb659c0a8cfe3
tree378f7855e5b97ba2f562e640aa748ed737b3151f
parentcd936c21f6c8ef90f334bffe433f784f3a4e0191
merge with master
52 files changed:
CMakeLists.txt
binary_xmlresource/binary_xmlresource.cpp
binary_xmlresource/default_configure_bin_parser.cpp
binary_xmlresource/include/_auto_metadata.h
binary_xmlresource/key_coordinate_frame_bin_parser.cpp
binary_xmlresource/label_properties_bin_parser.cpp
packaging/libscl-ui.spec
res/put_record.h
res/simple_debug.cpp [new file with mode: 0644]
res/simple_debug.h
res/simple_debug_test.cpp [moved from res/timer.cpp with 64% similarity]
res/timer.h [deleted file]
scl/gwes/efl/sclevents-efl.cpp
scl/gwes/efl/sclwindows-efl.cpp
scl/include/sclstructs.h
scl/include/sclui.h
scl/include/scluiimpl.h
scl/include/sclversion.h
scl/sclcontroller.cpp
scl/sclresourcecache.cpp
scl/sclui.cpp
scl/scluibuilder.cpp
scl/scluiimpl.cpp
sclres/sclres_manager.cpp
xml2binary/CMakeLists.txt
xml2binary/data/metadata.xml
xml2binary/encode_default_configure.cpp
xml2binary/encode_input_mode_configure.cpp
xml2binary/encode_key_coordinate_frame.cpp
xml2binary/encode_layout.cpp
xml2binary/include/_auto_metadata.h
xml2binary/xml2dat.cpp
xmlresource/autopopup_configure_parser.cpp
xmlresource/default_configure_parser.cpp
xmlresource/include/autopopup_configure_parser.h
xmlresource/include/default_configure_parser.h
xmlresource/include/input_mode_configure_parser.h
xmlresource/include/label_properties_parser.h
xmlresource/include/layout_parser.h
xmlresource/include/magnifier_configure_parser.h
xmlresource/include/main_entry_parser.h
xmlresource/include/modifier_decoration_parser.h
xmlresource/include/nine_patch_file_list_parser.h
xmlresource/include/xmlresource.h
xmlresource/input_mode_configure_parser.cpp
xmlresource/label_properties_parser.cpp
xmlresource/layout_parser.cpp
xmlresource/magnifier_configure_parser.cpp
xmlresource/main_entry_parser.cpp
xmlresource/modifier_decoration_parser.cpp
xmlresource/nine_patch_file_list_parser.cpp
xmlresource/xmlresource.cpp