about summary refs log tree commit diff stats
path: root/src/command/command.c
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2016-02-14 23:00:52 +0000
committerJames Booth <boothj5@gmail.com>2016-02-14 23:00:52 +0000
commit1f90aca503ed8a2c47aea55496b8ae8656b1e416 (patch)
tree0baa62fa05a7e775143607ca0b35deba34b5cd57 /src/command/command.c
parent41fe8c22b1f8c1cf666d42052cd73d59e40a2ed2 (diff)
parente53e94f1e2c357302c25be58834158a2dbb55652 (diff)
downloadprofani-tty-1f90aca503ed8a2c47aea55496b8ae8656b1e416.tar.gz
Merge branch 'master' into plugins-c
Conflicts:
	src/main.c
	src/ui/console.c
Diffstat (limited to 'src/command/command.c')
-rw-r--r--src/command/command.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/command/command.c b/src/command/command.c
index 67a725f5..32f69791 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -1,7 +1,7 @@
 /*
  * command.c
  *
- * Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com>
+ * Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
  *
  * This file is part of Profanity.
  *