From 4cf0763845137086fccd3da62475a4826ae1b97c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 2 Jan 2014 00:34:51 -0500
Subject: [PATCH] Nibbler

- Merged libexpr changes.
---
 src/Nibbler.cpp    |  6 ++----
 src/Nibbler.h      |  3 +--
 test/nibbler.t.cpp | 13 +++++++------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/Nibbler.cpp b/src/Nibbler.cpp
index a42fc73e1..9974ca687 100644
--- a/src/Nibbler.cpp
+++ b/src/Nibbler.cpp
@@ -1,7 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
-// taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2014, Paul Beckingham, Federico Hernandez.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -25,6 +24,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
+#include <cmake.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
@@ -37,8 +37,6 @@
 #ifdef NIBBLER_FEATURE_REGEX
 #include <RX.h>
 #endif
-#include <cmake.h>
-#include <util.h>
 
 static const char*        _uuid_pattern    = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx";
 static const unsigned int _uuid_min_length = 14;
diff --git a/src/Nibbler.h b/src/Nibbler.h
index 3b84d1d7d..d48e6e5b6 100644
--- a/src/Nibbler.h
+++ b/src/Nibbler.h
@@ -1,7 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
-// taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2014, Paul Beckingham, Federico Hernandez.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/nibbler.t.cpp b/test/nibbler.t.cpp
index 612f2c9db..bdda4a2b5 100644
--- a/test/nibbler.t.cpp
+++ b/test/nibbler.t.cpp
@@ -1,7 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
-// taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2014, Paul Beckingham, Federico Hernandez.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -25,6 +24,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
+#include <cmake.h>
+#include <stdlib.h>
 #include <Context.h>
 #include <Nibbler.h>
 #ifdef NIBBLER_FEATURE_DATE
@@ -39,15 +40,15 @@ int main (int argc, char** argv)
 {
 #ifdef NIBBLER_FEATURE_DATE
 #ifdef NIBBLER_FEATURE_REGEX
-  UnitTest t (402);
+  UnitTest t (408);
 #else
-  UnitTest t (378);
+  UnitTest t (384);
 #endif
 #else
 #ifdef NIBBLER_FEATURE_REGEX
-  UnitTest t (352);
+  UnitTest t (344);
 #else
-  UnitTest t (328);
+  UnitTest t (320);
 #endif
 #endif