← Back to branch summary

~zorba-coders/zorba/identifiers

~zorba-coders/zorba/identifiers

Viewing all changes in revision 10515.

Committer: Federico Cavalieri
Date: 2011-10-10 10:31:20 UTC
mfrom: (10470.1.34 zorba)
Revision ID: fcavalieri83@gmail.com-20111010103120-rnk8k3cvpqrpx7ue

Merged the trunk in the branch. Fixed conflict in test/rbkt/Queries/CMakeLists.txt

files removed:
src/store/naive/node_vector.cpp

src/store/naive/node_vector.h

files modified:
CMakeLists.txt

cmake_modules/Windows/FindCURL.cmake

cmake_modules/Windows/ProxyFindModule.cmake

cmake_modules/ZorbaModule.cmake

doc/java/examples/CMakeLists.txt

include/zorba/static_context_consts.h

src/store/api/update_consts.h

src/store/naive/simple_index.h

test/rbkt/Queries/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

cmake_modules/Windows/FindCURL.cmake

cmake_modules/Windows/ProxyFindModule.cmake

cmake_modules/ZorbaModule.cmake

doc/java/examples/CMakeLists.txt

include/zorba/static_context_consts.h

src/store/api/update_consts.h

src/store/naive/node_vector.cpp

src/store/naive/node_vector.h

src/store/naive/simple_index.h

test/rbkt/Queries/CMakeLists.txt

Older »