Added licensing details...

icculus · Feb 26, 2007 · 90566f4 · 90566f4
1 parent 25365ec
commit 90566f4
Show file tree

Hide file tree

Showing 62 changed files with 827 additions and 0 deletions.
diff --git a/Application.cpp b/Application.cpp
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  Application.cpp - Implementation for the Application class
  *
  */

diff --git a/Application.h b/Application.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  Application.h - Main application class (program starts here)
  *
  */

diff --git a/CompareFilePanel.cpp b/CompareFilePanel.cpp
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  CompareFilePanel.cpp - Implementation of the CompareFilePanel class
  *
  */

diff --git a/CompareFilePanel.h b/CompareFilePanel.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  CompareFilePanel.h - UI class for a single file.  This class is typically
  *  used in conjunction with the CompareFilesUI class.  CompareFilePanel class
  *  contains a textbox, combobox, and directory selection button.  It binds the

diff --git a/CompareFilesUI.cpp b/CompareFilesUI.cpp
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  CompareFilesUI.cpp - Implementation of CompareFilesUI class
  *
  */

diff --git a/CompareFilesUI.h b/CompareFilesUI.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  CompareFilesUI.h - Window that provides the interface for comparing files
  *
  */

diff --git a/CompareFolderPanel.cpp b/CompareFolderPanel.cpp
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  CompareFolderPanel.cpp - Implementation of the CompareFolderPanel class
  *
  */

diff --git a/CompareFolderPanel.h b/CompareFolderPanel.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  CompareFolderPanel.h - UI class for a single file.  This class is typically
  *  used in conjunction with the CompareFilesUI class.  CompareFolderPanel class
  *  contains a textbox, combobox, and directory selection button.  It binds the

diff --git a/CompareFolders.cpp b/CompareFolders.cpp
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 #include "CompareFolders.h"
 #include <assert.h>
 #include "wx/dir.h"

diff --git a/CompareFolders.h b/CompareFolders.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  CompareFolders.h - This class examines two or three folders (and optionally
  *  subfolders) and determines how the directory structures and the content
  *  differ.

diff --git a/CompareFoldersUI.cpp b/CompareFoldersUI.cpp
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  CompareFoldersUI.cpp - Implementation of CompareFoldersUI class
  *
  */

diff --git a/CompareFoldersUI.h b/CompareFoldersUI.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  CompareFoldersUI.h - Window that provides the interface for comparing folders
  *
  */

diff --git a/CompareUI.h b/CompareUI.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  CompareUI.h - Base class for Compare window objects.  This provides an
  *  interface for functions that are used on all types of comparison windows.
  */

diff --git a/Config.cpp b/Config.cpp
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  Config.cpp - Implementation for Config class
  *
  */

diff --git a/Config.h b/Config.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  Config.h - Class to read/write configuration data for MojoMerge
  *  The Config class will use the wxConfig class to save/restore configuration
  *  data in a portable manor.

diff --git a/ConfigUI.cpp b/ConfigUI.cpp
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  ConfigUI.cpp - Implementation of ConfigUI object
  *
  */

diff --git a/ConfigUI.h b/ConfigUI.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  ConfigUI.h - User interface to the Config object
  *
  */

diff --git a/DataTypes.h b/DataTypes.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /* DataTypes.h - Generic data types used by objects in the MojoMerge namespace
  *
  */

diff --git a/Diff.h b/Diff.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  Diff.h - Base class for various Diff implementations
  *
  */

diff --git a/DiffTextEdit.cpp b/DiffTextEdit.cpp
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  DiffTextEdit.cpp - Implementation of DiffTextEdit class
  *
  */

diff --git a/DiffTextEdit.h b/DiffTextEdit.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  DiffTextEdit.h - wxStyledTextCtrl with special "helper" functions used
  *  specifically for marking diffs, merging, etc...
  */

diff --git a/FileMergeTransaction.cpp b/FileMergeTransaction.cpp
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  FileMergeTransaction - Implementation of the FileMergeTransaction class.
  *
  */

diff --git a/FileMergeTransaction.h b/FileMergeTransaction.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  FileMergeTransaction.h - A transaction specific to file merging
  *
  */

diff --git a/FolderHunk.cpp b/FolderHunk.cpp
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  FolderHunk.cpp - Implementation of FolderHunk class
  *
  */

diff --git a/FolderHunk.h b/FolderHunk.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  FolderHunk.h - Class that represents a block of files and folders
  *  resulting from a folder comparison.  Unlike the "Hunk" object, this object
  *  contains everything in the comparison, not just differences.

diff --git a/FolderMerge.cpp b/FolderMerge.cpp
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  FolderMerge.cpp - Implementation of FolderMerge class
  *
  */

diff --git a/FolderMerge.h b/FolderMerge.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  FolderMerge.h - Class for making merge transactions from FolderHunks
  *
  */

diff --git a/FolderMergeTransaction.cpp b/FolderMergeTransaction.cpp
@@ -0,0 +1,8 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
diff --git a/FolderMergeTransaction.h b/FolderMergeTransaction.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  FileMergeTransaction.h - A transaction specific to file merging
  *
  */

diff --git a/GNUDiff.cpp b/GNUDiff.cpp
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  GNUDiff.cpp - Implementation for the GNUDiff class
  *
  */

diff --git a/GNUDiff.h b/GNUDiff.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  GNUDiff.h - Implementation of Diff using the GNU Diff command-line tools
  *
  */

diff --git a/Hunk.cpp b/Hunk.cpp
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  Hunk.cpp - Implementation for the Hunk class
  *
  */

diff --git a/Hunk.h b/Hunk.h
@@ -1,3 +1,11 @@
+/*
+ * MojoMerge -- A cross-platform compare-and-merge utility.
+ * Copyright (C) 2007 Ryan C. Gordon and Gregory S. Read.
+ *
+ * Please refer to LICENSE.txt in the root directory of the source
+ *  distribution for licensing details.
+ */
+
 /*  Hunk.h - This class represents a change in a diff comparison
  *
  */