mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-06-26 10:54:26 +02:00
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
This commit is contained in:
commit
8af0a7f3ba
548 changed files with 13752 additions and 2435 deletions
5
INSTALL
5
INSTALL
|
@ -12,6 +12,9 @@ from source.
|
|||
|
||||
More information on cmake can be obtained at http://cmake.org
|
||||
|
||||
It is HIGHLY RECOMMENDED that you build with a library that provides uuid_*
|
||||
functions, such as libuuid.
|
||||
|
||||
|
||||
Basic Installation
|
||||
------------------
|
||||
|
@ -139,7 +142,7 @@ Darwin, 32bit
|
|||
Troubleshooting
|
||||
---------------
|
||||
|
||||
If you've recently made changes to dependencies (by reinstalling libuuid, for
|
||||
If you've recently made changes to dependencies (by reinstalling them, for
|
||||
example) be sure to rerun 'cmake .' before trying to execute 'make' again.
|
||||
|
||||
CMake will run and locate all the necessary pieces for the build, and create
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue