Skip to content

Patch 4 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GH-integration wants to merge 16 commits into
base: test
Choose a base branch
from
Open

Patch 4 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5721035
more minor changes
iluxa-com Jan 25, 2016
0b37283
more minor changes 2
iluxa-com Jan 25, 2016
c142947
empty line
iluxa-com Jan 25, 2016
b2c00cd
spaces added
iluxa-com Jan 25, 2016
7039514
Update TestPlugin.java
iluxa-com Jan 26, 2016
8da810c
delete 2 lines
iluxa-com Feb 2, 2016
809ba9d
Create c0m.txt
iluxa-c0m Feb 20, 2016
29c6ecf
Update c0m.txt
iluxa-c0m Feb 20, 2016
4676cd6
Create c0m2.txt
iluxa-c0m Feb 20, 2016
bf348a3
Update c0m2.txt
iluxa-c0m Feb 20, 2016
24738d1
Update build.gradle
iluxa-com Mar 3, 2016
7ef9e7b
Update build.gradle
iluxa-com Mar 3, 2016
1f7af45
Create test.xml
iluxa-com Mar 3, 2016
a277a46
Update server
iluxa-com Mar 18, 2016
40ccf2e
Merge pull request #2 from iluxa-c0m/c0m-branch
iluxa-com Mar 18, 2016
4d22780
Create master.txt
iluxa-c0m Jul 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ compileJava {



println System.getProperty('java.home') ()


println System.getProperty('java.home') ()
27 changes: 27 additions & 0 deletions c0m.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
abc
█████████████████████████████████████████████████████████████
█░░░░░░██░░░░░░█░░░░░░░░░░░░░░█░░░░░░██░░░░░░█░░░░░░░░░░░░░░█
█░░▄▀░░██░░▄▀░░█░░▄▀▄▀▄▀▄▀▄▀░░█░░▄▀░░██░░▄▀░░█░░▄▀▄▀▄▀▄▀▄▀░░█
█░░▄▀░░██░░▄▀░░█░░▄▀░░░░░░▄▀░░█░░▄▀░░██░░▄▀░░█░░▄▀░░░░░░░░░░█
█░░▄▀░░██░░▄▀░░█░░▄▀░░██░░▄▀░░█░░▄▀░░██░░▄▀░░█░░▄▀░░█████████
█░░▄▀░░░░░░▄▀░░█░░▄▀░░░░░░▄▀░░█░░▄▀░░██░░▄▀░░█░░▄▀░░░░░░░░░░█
█░░▄▀▄▀▄▀▄▀▄▀░░█░░▄▀▄▀▄▀▄▀▄▀░░█░░▄▀░░██░░▄▀░░█░░▄▀▄▀▄▀▄▀▄▀░░█
█░░▄▀░░░░░░▄▀░░█░░▄▀░░░░░░▄▀░░█░░▄▀░░██░░▄▀░░█░░▄▀░░░░░░░░░░█
█░░▄▀░░██░░▄▀░░█░░▄▀░░██░░▄▀░░█░░▄▀▄▀░░▄▀▄▀░░█░░▄▀░░█████████
█░░▄▀░░██░░▄▀░░█░░▄▀░░██░░▄▀░░█░░░░▄▀▄▀▄▀░░░░█░░▄▀░░░░░░░░░░█
█░░▄▀░░██░░▄▀░░█░░▄▀░░██░░▄▀░░███░░░░▄▀░░░░███░░▄▀▄▀▄▀▄▀▄▀░░█
█░░░░░░██░░░░░░█░░░░░░██░░░░░░█████░░░░░░█████░░░░░░░░░░░░░░█
█████████████████████████████████████████████████████████████
█████████████████████████████████████████████████████████████
█░░░░░░░░░░░░░░█░░░░░░██░░░░░░█░░░░░░██████████░░░░░░█░░░░░░█
█░░▄▀▄▀▄▀▄▀▄▀░░█░░▄▀░░██░░▄▀░░█░░▄▀░░░░░░░░░░██░░▄▀░░█░░▄▀░░█
█░░▄▀░░░░░░░░░░█░░▄▀░░██░░▄▀░░█░░▄▀▄▀▄▀▄▀▄▀░░██░░▄▀░░█░░▄▀░░█
█░░▄▀░░█████████░░▄▀░░██░░▄▀░░█░░▄▀░░░░░░▄▀░░██░░▄▀░░█░░▄▀░░█
█░░▄▀░░░░░░░░░░█░░▄▀░░██░░▄▀░░█░░▄▀░░██░░▄▀░░██░░▄▀░░█░░▄▀░░█
█░░▄▀▄▀▄▀▄▀▄▀░░█░░▄▀░░██░░▄▀░░█░░▄▀░░██░░▄▀░░██░░▄▀░░█░░▄▀░░█
█░░▄▀░░░░░░░░░░█░░▄▀░░██░░▄▀░░█░░▄▀░░██░░▄▀░░██░░▄▀░░█░░░░░░█
█░░▄▀░░█████████░░▄▀░░██░░▄▀░░█░░▄▀░░██░░▄▀░░░░░░▄▀░░████████
█░░▄▀░░█████████░░▄▀░░░░░░▄▀░░█░░▄▀░░██░░▄▀▄▀▄▀▄▀▄▀░░█░░░░░░█
█░░▄▀░░█████████░░▄▀▄▀▄▀▄▀▄▀░░█░░▄▀░░██░░░░░░░░░░▄▀░░█░░▄▀░░█
█░░░░░░█████████░░░░░░░░░░░░░░█░░░░░░██████████░░░░░░█░░░░░░█
█████████████████████████████████████████████████████████████
12 changes: 12 additions & 0 deletions c0m2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
─────────────────────────────────────────────────────────────
─██████████████─██████████████─██████████████─██████████████─
─██░░░░░░░░░░██─██░░░░░░░░░░██─██░░░░░░░░░░██─██░░░░░░░░░░██─
─██████░░██████─██░░██████████─██░░██████████─██████░░██████─
─────██░░██─────██░░██─────────██░░██─────────────██░░██─────
─────██░░██─────██░░██████████─██░░██████████─────██░░██─────
─────██░░██─────██░░░░░░░░░░██─██░░░░░░░░░░██─────██░░██─────
─────██░░██─────██░░██████████─██████████░░██─────██░░██─────
─────██░░██─────██░░██████████─██████████░░██─────██░░██─────
─────██░░██─────██░░░░░░░░░░██─██░░░░░░░░░░██─────██░░██─────
─────██████─────██████████████─██████████████─────██████─────
─────────────────────────────────────────────────────────────
1 change: 1 addition & 0 deletions master.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
master
2 changes: 1 addition & 1 deletion server
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
123
11
1123
7 changes: 3 additions & 4 deletions src/main/java/org/gradle/support/TestPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
package org.gradle.support;

/**
* Created by Ilya.Komolkin on 11/17/2015.
* first commit

* second
*
*
*
*
* third
*/
public class TestPlugin {
//1
//2
//3
//3 ++++
//Major
//minor in the middle
}
5 changes: 3 additions & 2 deletions src/main/java/org/gradle/support/big.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

/*Generated by MPS */


import jetbrains.mps.webr.runtime.templateComponent.TemplateComponent;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Expand Down Expand Up @@ -75,7 +76,7 @@ public IssueItem_HtmlTemplateComponent(Map<String, Object> templateParameters) {
super(null, null, "IssueItem", templateParameters);
}

public IssueItem_HtmlTemplateComponent() {
public IssueItem_HtmlTemplateComponent() {//more minor changes
super(null, null, "IssueItem");
}

Expand Down Expand Up @@ -274,7 +275,7 @@ protected void renderTemplate(Map<String, Object> rootMap, final TBuilderContext
} else {
childTemplateComponent = new TagsPanel_HtmlTemplateComponent(null, null, null, childTemplateParameters);
}
childTemplateComponent.setRefName("tp");
childTemplateComponent.setRefName("tp"); //more minor changes
}
TemplateComponent currentTemplateComponent = builderContext.getCurrentTemplateComponent();
if (currentTemplateComponent != null) {
Expand Down
3 changes: 3 additions & 0 deletions test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<xml>
test
</xml>