-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/development'
- Loading branch information
Showing
14 changed files
with
235 additions
and
242 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,14 +3,14 @@ use ExtUtils::MakeMaker; | |
# See lib/ExtUtils/MakeMaker.pm for details of how to influence | ||
# the contents of the Makefile that is written. | ||
WriteMakefile( | ||
NAME => 'Video::File::TVShow::Import', | ||
VERSION_FROM => 'lib/Video/File/TVShow/Import.pm', # finds $VERSION | ||
NAME => 'File::TVShow::Organize', | ||
VERSION_FROM => 'lib/File/TVShow/Organize.pm', # finds $VERSION | ||
PREREQ_PM => { 'Video::Filename' => 0, | ||
'File::Path' => 0, | ||
'File::Path' => 0, | ||
'File::Copy' => 0, | ||
'Test::Carp' => 0, | ||
'Carp' => 0 }, # e.g., Module::Name => 1.1 | ||
($] >= 5.005 ? ## Add these new keywords supported since 5.005 | ||
(ABSTRACT_FROM => 'lib/Video/File/TVShow/Import.pm', # retrieve abstract from module | ||
(ABSTRACT_FROM => 'lib/File/TVShow/Organize.pm', # retrieve abstract from module | ||
AUTHOR => 'Adam Spann <[email protected]>') : ()), | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,4 @@ | ||
These items should be completed before the next major push to GitHub or local origin. | ||
<<<<<<< HEAD | ||
Update Testing to make it more organised again. Its gotten a bit out of control. | ||
|
||
Look at using Path::Tiny for path and file handling. | ||
>>>>>>> origin/development |
Oops, something went wrong.