Paul Beckingham 8af0a7f3ba Merge branch 'master' into 2.3.0 ... Conflicts: AUTHORS CMakeLists.txt INSTALL NEWS cmake.h.in doc/man/task-faq.5.in package-config/osx/README scripts/utils/verify_l10n src/API.h src/Config.cpp src/Context.cpp src/DOM.cpp src/Hooks.cpp src/TransportShell.h src/commands/CmdDiagnostics.cpp src/commands/CmdShell.cpp src/commands/CmdVersion.cpp src/en-US.h src/shell/Readline.h src/wcwidth6.cpp test/CMakeLists.txt test/color.uda.t test/duration.t.cpp test/hook.on-launch.t test/template.t test/uuid.t		2013-04-07 17:56:59 -04:00
..
man	Merge branch 'master' into 2.3.0	2013-04-07 17:56:59 -04:00
misc	Tutorial	2013-03-31 21:43:48 -04:00
rc	Copyright 2013	2013-03-04 17:47:12 -05:00
ref	Version number and release date for 2.2.0	2013-04-07 22:11:26 +02:00
CMakeLists.txt	Merge branch 'master' into 2.3.0	2013-04-07 17:56:59 -04:00