Skip to content

Commit 00b897d

Browse files
rjhancockrjhancock
authored
Merge branch 'master' into editSPAs
2 parents 961281a + c07e034 commit 00b897d

File tree

1,228 files changed

+5264
-3834
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,228 files changed

+5264
-3834
lines changed

‎MekHQ/src/mekhq/AtBGameThread.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
*
44
* This file is part of MekHQ.
55
*
6-
* MegaMek is free software: you can redistribute it and/or modify
6+
* MekHQ is free software: you can redistribute it and/or modify
77
* it under the terms of the GNU General Public License (GPL),
88
* version 3 or (at your option) any later version,
99
* as published by the Free Software Foundation.
1010
*
11-
* MegaMek is distributed in the hope that it will be useful,
11+
* MekHQ is distributed in the hope that it will be useful,
1212
* but WITHOUT ANY WARRANTY; without even the implied warranty
1313
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1414
* See the GNU General Public License for more details.

‎MekHQ/src/mekhq/CampaignPreset.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
*
44
* This file is part of MekHQ.
55
*
6-
* MegaMek is free software: you can redistribute it and/or modify
6+
* MekHQ is free software: you can redistribute it and/or modify
77
* it under the terms of the GNU General Public License (GPL),
88
* version 3 or (at your option) any later version,
99
* as published by the Free Software Foundation.
1010
*
11-
* MegaMek is distributed in the hope that it will be useful,
11+
* MekHQ is distributed in the hope that it will be useful,
1212
* but WITHOUT ANY WARRANTY; without even the implied warranty
1313
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1414
* See the GNU General Public License for more details.

‎MekHQ/src/mekhq/GameThread.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
*
44
* This file is part of MekHQ.
55
*
6-
* MegaMek is free software: you can redistribute it and/or modify
6+
* MekHQ is free software: you can redistribute it and/or modify
77
* it under the terms of the GNU General Public License (GPL),
88
* version 3 or (at your option) any later version,
99
* as published by the Free Software Foundation.
1010
*
11-
* MegaMek is distributed in the hope that it will be useful,
11+
* MekHQ is distributed in the hope that it will be useful,
1212
* but WITHOUT ANY WARRANTY; without even the implied warranty
1313
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1414
* See the GNU General Public License for more details.

‎MekHQ/src/mekhq/IconPackage.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
*
44
* This file is part of MekHQ.
55
*
6-
* MegaMek is free software: you can redistribute it and/or modify
6+
* MekHQ is free software: you can redistribute it and/or modify
77
* it under the terms of the GNU General Public License (GPL),
88
* version 3 or (at your option) any later version,
99
* as published by the Free Software Foundation.
1010
*
11-
* MegaMek is distributed in the hope that it will be useful,
11+
* MekHQ is distributed in the hope that it will be useful,
1212
* but WITHOUT ANY WARRANTY; without even the implied warranty
1313
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1414
* See the GNU General Public License for more details.

‎MekHQ/src/mekhq/MHQConstants.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
*
44
* This file is part of MekHQ.
55
*
6-
* MegaMek is free software: you can redistribute it and/or modify
6+
* MekHQ is free software: you can redistribute it and/or modify
77
* it under the terms of the GNU General Public License (GPL),
88
* version 3 or (at your option) any later version,
99
* as published by the Free Software Foundation.
1010
*
11-
* MegaMek is distributed in the hope that it will be useful,
11+
* MekHQ is distributed in the hope that it will be useful,
1212
* but WITHOUT ANY WARRANTY; without even the implied warranty
1313
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1414
* See the GNU General Public License for more details.

‎MekHQ/src/mekhq/MHQOptions.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
*
44
* This file is part of MekHQ.
55
*
6-
* MegaMek is free software: you can redistribute it and/or modify
6+
* MekHQ is free software: you can redistribute it and/or modify
77
* it under the terms of the GNU General Public License (GPL),
88
* version 3 or (at your option) any later version,
99
* as published by the Free Software Foundation.
1010
*
11-
* MegaMek is distributed in the hope that it will be useful,
11+
* MekHQ is distributed in the hope that it will be useful,
1212
* but WITHOUT ANY WARRANTY; without even the implied warranty
1313
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1414
* See the GNU General Public License for more details.

‎MekHQ/src/mekhq/MHQOptionsChangedEvent.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
*
44
* This file is part of MekHQ.
55
*
6-
* MegaMek is free software: you can redistribute it and/or modify
6+
* MekHQ is free software: you can redistribute it and/or modify
77
* it under the terms of the GNU General Public License (GPL),
88
* version 3 or (at your option) any later version,
99
* as published by the Free Software Foundation.
1010
*
11-
* MegaMek is distributed in the hope that it will be useful,
11+
* MekHQ is distributed in the hope that it will be useful,
1212
* but WITHOUT ANY WARRANTY; without even the implied warranty
1313
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1414
* See the GNU General Public License for more details.

‎MekHQ/src/mekhq/MHQStaticDirectoryManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
*
44
* This file is part of MekHQ.
55
*
6-
* MegaMek is free software: you can redistribute it and/or modify
6+
* MekHQ is free software: you can redistribute it and/or modify
77
* it under the terms of the GNU General Public License (GPL),
88
* version 3 or (at your option) any later version,
99
* as published by the Free Software Foundation.
1010
*
11-
* MegaMek is distributed in the hope that it will be useful,
11+
* MekHQ is distributed in the hope that it will be useful,
1212
* but WITHOUT ANY WARRANTY; without even the implied warranty
1313
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1414
* See the GNU General Public License for more details.

‎MekHQ/src/mekhq/MekHQ.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
*
55
* This file is part of MekHQ.
66
*
7-
* MegaMek is free software: you can redistribute it and/or modify
7+
* MekHQ is free software: you can redistribute it and/or modify
88
* it under the terms of the GNU General Public License (GPL),
99
* version 3 or (at your option) any later version,
1010
* as published by the Free Software Foundation.
1111
*
12-
* MegaMek is distributed in the hope that it will be useful,
12+
* MekHQ is distributed in the hope that it will be useful,
1313
* but WITHOUT ANY WARRANTY; without even the implied warranty
1414
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1515
* See the GNU General Public License for more details.

‎MekHQ/src/mekhq/NullEntityException.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
*
44
* This file is part of MekHQ.
55
*
6-
* MegaMek is free software: you can redistribute it and/or modify
6+
* MekHQ is free software: you can redistribute it and/or modify
77
* it under the terms of the GNU General Public License (GPL),
88
* version 3 or (at your option) any later version,
99
* as published by the Free Software Foundation.
1010
*
11-
* MegaMek is distributed in the hope that it will be useful,
11+
* MekHQ is distributed in the hope that it will be useful,
1212
* but WITHOUT ANY WARRANTY; without even the implied warranty
1313
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1414
* See the GNU General Public License for more details.

0 commit comments

Comments
 (0)