diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-03-06 16:51:24 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-03-06 16:51:24 +0000 |
| commit | 485e76fea076b2a5f0efeab3ac7f98037f4e00c0 (patch) | |
| tree | 20203fdb48138d1cb2fb1530ec765c5faa04bbdd /Makefile.am | |
| parent | f585763060076fdd5104409554613b9ca110f910 (diff) | |
| parent | 1db1e045a3ce3d505718572ca14546bb4273e7a3 (diff) | |
| download | tbdiff-485e76fea076b2a5f0efeab3ac7f98037f4e00c0.tar.gz | |
Merge branch 'baserock/pedroalvarez/trove-upgrades-rebase2'
Reviewed-by: Richard Maw
Reviewed-by: Lars Wirzenius
Reviewed-by: Sam Thursfield
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 746bd9c..e3d38ef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # vi:set ts=8 sw=8 noet ai nocindent: # - -# Copyright (c) 2011-2013 Codethink Ltd. +# Copyright (c) 2011-2014 Codethink Ltd. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License Version 2 as @@ -22,6 +22,7 @@ SUBDIRS = \ tb-switch \ tb-update \ baserock-system-config-sync \ + system-version-manager \ tests .PHONY: ChangeLog |