From 13b8283666445a8cb74ca3ff8825d6a0df042cee Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Wed, 24 Feb 2016 23:19:15 -0500 Subject: [PATCH] Cleanup: Removed deprecated 'alias._query' setting --- ChangeLog | 14 ++------------ DEVELOPER | 4 ++-- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79c7a9482..6f51c60ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,8 @@ - Improved certificate validation diagnostics (thanks to Jelle van der Waa). +- Removed deprecated 'alias._query' setting. + ------ current release --------------------------- 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0 @@ -168,20 +170,8 @@ - The 'run_all' script was not correctly using exit code 0 when all tests pass (thanks to Gordon Ball). -<<<<<<< HEAD -<<<<<<< HEAD ------- current release --------------------------- - -||||||| parent of 19b2151f... Cleanup: Removed deprecated 'alias._query' setting -======= ------ old releases ------------------------------ ->>>>>>> 19b2151f... Cleanup: Removed deprecated 'alias._query' setting -||||||| merged common ancestors ------- current release --------------------------- - -======= ->>>>>>> Bumped documentation to 2.6.0 2.5.0 (2015-10-21) dd5968a61b1fab258b38879cfdbb7d67f1bcd550 - TW-20 Task edit loses annotation precision, causing journal updating code diff --git a/DEVELOPER b/DEVELOPER index ce2f9b01b..2a53dcd9c 100644 --- a/DEVELOPER +++ b/DEVELOPER @@ -10,7 +10,7 @@ How to Build Taskwarrior Obtain and build code: $ git clone --recursive https://git.tasktools.org/scm/tm/task.git task.git $ cd task.git - $ git checkout 2.6.0 # Latest dev branch + $ git checkout 2.5.2 # Latest dev branch $ git submodule update # Update the libhsared.git submodule $ cmake -DCMAKE_BUILD_TYPE=debug . # debug or release. Default: neither $ make VERBOSE=1 -j8 # Shows details, builds using 8 jobs @@ -156,4 +156,4 @@ Current Codebase Condition --- -2016-12-18 Updated for 2.6.0 +2018-05-13 Updated for 2.5.2