Skip to content

Commit

Permalink
Fix #105: copyright tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
brodieG committed Nov 6, 2017
2 parents 4a2ad0f + 851f559 commit 3cedd96
Show file tree
Hide file tree
Showing 33 changed files with 36 additions and 34 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Type: Package
Title: Diffs for R Objects
Description: Generate a colorized diff of two R objects for an intuitive
visualization of their differences.
Version: 0.1.6.9005
Version: 0.1.6.9006
Date: 2017-11-05
Authors@R: c(
person(
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
copying `crayon` functions
([@seulki-choi](https://stackoverflow.com/users/7788015/seulki-choi),
@gaborcsardi)
* [#100](https://github.com/brodieG/diffobj/issues/100): R_useDynamicSymbols
* [#105](https://github.com/brodieG/diffobj/issues/105): Copyright tweaks

## v0.1.6

Expand Down
2 changes: 1 addition & 1 deletion R/capt.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/check.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/core.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/diff.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/finalizer.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/get.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/guides.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/html.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/hunks.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/layout.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/misc.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/myerssimple.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/pager.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/rdiff.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/rds.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/s4.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/set.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/styles.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/subset.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/summmary.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/system.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/text.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/tochar.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/trim.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
2 changes: 1 addition & 1 deletion R/word.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Brodie Gaslam
# Copyright (C) 2017 Brodie Gaslam
#
# This file is part of "diffobj - Diffs for R Objects"
#
Expand Down
6 changes: 3 additions & 3 deletions inst/COPYRIGHTS
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ The original source code is available at:

The adapted and heavily modified code is available in src/diff.c, src/diff.h. See those files for additional details.

This package is released under the GPL-3 license:
This package is released under the GPL (>= 2) or greater license:

diffobj - Compare R Objects with a Diff
Copyright (C) 2016 Brodie Gaslam
License: GPL-3
Copyright (C) 2017 Brodie Gaslam
License: GPL (>= 2)
2 changes: 1 addition & 1 deletion src/diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* implementation is not compatible with the original one. See next
* comment blocks for original copyright and license information.
*
* Copyright (C) 2016 Brodie Gaslam
* Copyright (C) 2017 Brodie Gaslam
*
* This file is part of "diffobj - Diffs for R Objects"
*
Expand Down
2 changes: 1 addition & 1 deletion src/diff.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* implementation is not compatible with the original one. See next
* comment blocks for original copyright and license information.
*
* Copyright (C) 2016 Brodie Gaslam
* Copyright (C) 2017 Brodie Gaslam
*
* This file is part of "diffobj - Diffs for R Objects"
*
Expand Down
2 changes: 1 addition & 1 deletion src/diffobj.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 Brodie Gaslam
* Copyright (C) 2017 Brodie Gaslam
*
* This file is part of "diffobj - Diffs for R Objects"
*
Expand Down
2 changes: 1 addition & 1 deletion src/diffobj.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 Brodie Gaslam
* Copyright (C) 2017 Brodie Gaslam
*
* This file is part of "diffobj - Diffs for R Objects"
*
Expand Down
2 changes: 1 addition & 1 deletion src/init.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 Brodie Gaslam
* Copyright (C) 2017 Brodie Gaslam
*
* This file is part of "diffobj - Diffs for R Objects"
*
Expand Down

0 comments on commit 3cedd96

Please sign in to comment.