summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnathan Corgan <jcorgan@corganenterprises.com>2012-03-05 11:53:14 -0800
committerJohnathan Corgan <jcorgan@corganenterprises.com>2012-03-05 11:53:14 -0800
commit22d1f5c3db78db84237041346cc4e72382fa658f (patch)
treee37f192fef0d6bc21a282fc0a69377252b90c8be
parente0f885c8325f164334030429ae731e613de9add2 (diff)
parent1864683c7036b47eee254e75b4a1db60dd3f5d26 (diff)
Merge remote branch 'gnuradio/master' into next
-rw-r--r--README1
1 files changed, 1 insertions, 0 deletions
diff --git a/README b/README
index 296b0cec10..196c7a4898 100644
--- a/README
+++ b/README
@@ -279,3 +279,4 @@ changes have been made. For some files, changes have occurred in many
consecutive years. These files may often have the format of a year
range (e.g., "2006 - 2011"), which indicates that these files have had
copyrightable changes made during each year in the range, inclusive.
+