…hough.

…ryspeed

Conflicts:
	README.md
	build.sh
	changelog.txt
	config.mk
	doc/ref_cpp/data/dyn_query_ref.yaml
	doc/ref_cpp/data/dyn_table_ref.yaml
	doc/ref_cpp/data/dyn_view_ref.yaml
	doc/ref_cpp/data/group_ref.yaml
	doc/ref_cpp/data/mixed_ref.yaml
	doc/ref_cpp/data/reference.yaml
	doc/ref_cpp/data/shared_group_ref.yaml
	doc/ref_cpp/data/typed_table_ref.yaml
	generic.mk
	src/tightdb/Makefile
	src/tightdb/alloc_slab.cpp
	src/tightdb/array.cpp
	src/tightdb/array.hpp
	src/tightdb/binary_data.hpp
	src/tightdb/column.cpp
	src/tightdb/query.cpp
	src/tightdb/query.hpp
	src/tightdb/query_engine.hpp
	src/tightdb/table.cpp
	src/tightdb/table.hpp
	src/tightdb/utilities.cpp
	src/tightdb/utilities.hpp
	test/.gitignore
	test/TestQuery.cpp
	test/main.cpp
	test/testshared.cpp

…ryspeed

Conflicts:
	test/testshared.cpp

…_float

Conflicts:
	TightDB.vcxproj
	TightDB.vcxproj.filters

…n() methods (except for IsIntColumn()).

Further templated Column::aggregate()

…_float

Conflicts:
	TightDB.vcxproj
	TightDB.vcxproj.filters
	src/tightdb/array.hpp
	src/tightdb/array_basic.hpp
	src/tightdb/column.cpp
	src/tightdb/column_basic_tpl.hpp
	test/TestQuery.cpp
	test/testarrayfloat.cpp

…ryspeed

Conflicts:
	src/tightdb/array.hpp

…_float

Conflicts:
	test/TestQuery.cpp

…_float

Conflicts:
	test/TestQuery.cpp

…ryspeed

Conflicts:
	test/TestQuery.cpp

…ryspeed

…_float

Conflicts:
	src/tightdb/query.cpp

…ryspeed

Conflicts:
	src/tightdb/query_engine.hpp
	test/TestQuery.cpp

…_float

Conflicts:
	src/tightdb/array.hpp
	src/tightdb/query_engine.hpp
	src/tightdb/query_tpl.hpp

…_float

…resentable in ieee

…ns float on sum())

…_float

Conflicts:
	test/TestQuery.cpp

… for int64_t min/max to use column aggregation method.

Added testcases for Table aggregates (there was none in advance!)

Conflicts:
	TightDB.vcxproj
	changelog.txt
	src/tightdb/group_shared.cpp
	src/tightdb/group_writer.cpp
	src/tightdb/index_string.hpp
	src/tightdb/mixed.hpp
	src/tightdb/table_view.cpp

…a BUG!). floats & doubles also supported.

Added testcases to ArrayBasic.

…ryspeed

Conflicts:
	TightDB.vcxproj
	TightDB.vcxproj.filters
	changelog.txt
	src/tightdb/alloc_slab.cpp
	src/tightdb/alloc_slab.hpp
	src/tightdb/array.cpp
	src/tightdb/array.hpp
	src/tightdb/column.cpp
	src/tightdb/column.hpp
	src/tightdb/column_mixed.cpp
	src/tightdb/column_mixed.hpp
	src/tightdb/column_string.hpp
	src/tightdb/column_tpl.hpp
	src/tightdb/mixed.hpp
	src/tightdb/table.cpp
	src/tightdb/table.hpp
	src/tightdb/table_accessors.hpp
	src/tightdb/table_view.cpp
	src/tightdb/table_view.hpp
	src/tightdb/utilities.hpp
	test/TestQuery.cpp
	test/main.cpp
	test/testtable.cpp
	test/transactions.cpp

Renamed classes ArrayBasic->BasicArray, ColumnBasic->BasicColumn

…ee GitHub comments.

Moved definitions of ArrayFloat and ArrayDouble to Array.hpp.
Removed column_float.hpp and column_double.hpp. Now defined in column_fwd.hpp.
Created column_mixed_tpl.hpp and moved many methods to this file to allow inline of simple methods.

…erge