git.labs.libre-entreprise.org Git - tiramisu.git/commit

projects / tiramisu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 299e51e aa07345)

author	Emmanuel Garette <egarette@cadoles.com>
	Sun, 13 Apr 2014 08:30:42 +0000 (10:30 +0200)
committer	Emmanuel Garette <egarette@cadoles.com>
	Sun, 13 Apr 2014 08:30:42 +0000 (10:30 +0200)
commit	5d8b5719a08039b6df2d73b91a001a7a9ebd454e
tree	59967e2c982ab7789cd7956829864e2b6377f309	tree \| snapshot
parent	299e51e806ba98929670b93d716bc8c185b9996d	commit \| diff
parent	aa0734591d171bd166a526ba9e2969f2a958a216	commit \| diff

Merge branch 'master' into orm

Conflicts:
test/test_config_api.py
tiramisu/autolib.py
tiramisu/config.py
tiramisu/option.py
tiramisu/value.py

17 files changed:

test/test_config.py	diff1 \|	diff2 \|	blob \| history
test/test_config_api.py	diff1 \|	diff2 \|	blob \| history
test/test_option_calculation.py	diff1 \|	diff2 \|	blob \| history
test/test_option_consistency.py	diff1 \|	diff2 \|	blob \| history
test/test_option_setting.py	diff1 \|	diff2 \|	blob \| history
test/test_option_validator.py	diff1 \|	diff2 \|	blob \| history
tiramisu/autolib.py	diff1 \|	diff2 \|	blob \| history
tiramisu/config.py	diff1 \|	diff2 \|	blob \| history
tiramisu/option/baseoption.py	\|	diff2 \|	blob \| history
tiramisu/option/masterslave.py	\|	diff2 \|	blob \| history
tiramisu/option/option.py	\|	diff2 \|	blob \| history
tiramisu/option/optiondescription.py	\|	diff2 \|	blob \| history
tiramisu/setting.py	diff1 \|	diff2 \|	blob \| history
tiramisu/storage/__init__.py	diff1 \|	diff2 \|	blob \| history
tiramisu/storage/dictionary/__init__.py	diff1 \|	diff2 \|	blob \| history
tiramisu/storage/util.py	diff1 \|	diff2 \|	blob \| history
tiramisu/value.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.