Paul Beckingham
98f740e9d1
Merge branch '2.3.0' into 2.4.0
Conflicts:
AUTHORS
CMakeLists.txt
NEWS
src/A3.cpp
src/CMakeLists.txt
src/Config.cpp
src/Duration.cpp
src/Duration.h
src/Nibbler.cpp
src/Nibbler.h
src/RX.cpp
src/RX.h
src/columns/ColDate.cpp
src/columns/ColScheduled.cpp
src/commands/Command.cpp
src/legacy.cpp
src/utf8.cpp
src/utf8.h
test/CMakeLists.txt
test/bug.mergedeps.t.postponed
test/duration.t.cpp
test/merge.duplicates.t
test/merge.simple_duplication.t
test/merge.t
test/nibbler.t.cpp
test/roundtrip.t
test/rx.t.cpp
test/utf8.t.cpp
2014-01-07 19:10:03 -05:00
..
2013-12-13 22:43:02 -05:00
2014-01-04 12:16:39 -05:00
2014-01-01 13:32:22 -05:00
2014-01-01 13:32:22 -05:00
2014-01-04 12:16:39 -05:00
2014-01-01 13:32:22 -05:00
2014-01-07 19:10:03 -05:00
2014-01-01 13:32:22 -05:00