From f2ef9a9d395ccebc98403b7280721cc733377c42 Mon Sep 17 00:00:00 2001 From: athkalia Date: Thu, 24 Sep 2015 18:27:22 +0300 Subject: [PATCH 1/4] Update and rename Square.xml to codestyle.xml Added my codestyle --- configs/Square.xml | 256 ------------------------------------------ configs/codestyle.xml | 170 ++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+), 256 deletions(-) delete mode 100644 configs/Square.xml create mode 100644 configs/codestyle.xml diff --git a/configs/Square.xml b/configs/Square.xml deleted file mode 100644 index e08699a..0000000 --- a/configs/Square.xml +++ /dev/null @@ -1,256 +0,0 @@ - - - - - - - diff --git a/configs/codestyle.xml b/configs/codestyle.xml new file mode 100644 index 0000000..49a1601 --- /dev/null +++ b/configs/codestyle.xml @@ -0,0 +1,170 @@ + + From 96371c93ba55a874fd16530b27610bd1a99fe580 Mon Sep 17 00:00:00 2001 From: athkalia Date: Thu, 24 Sep 2015 18:27:49 +0300 Subject: [PATCH 2/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dcc3aac..0cd6765 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Java Code Styles ================ -IntelliJ IDEA code style settings for Square's Java and Android projects. +IntelliJ IDEA code style settings for Java and Android projects. Installation From f46766459eefe5bfb864ae08006f5530bdd027b5 Mon Sep 17 00:00:00 2001 From: athkalia Date: Thu, 24 Sep 2015 18:28:13 +0300 Subject: [PATCH 3/4] Update install.sh --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 5477a0a..d4c306a 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ #!/bin/bash -# Installs Square's IntelliJ configs into your user configs. +# Installs IntelliJ configs into your user configs. -echo "Installing Square code style configs..." +echo "Installing code style configs..." CONFIGS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/configs" From de35615d1c1c5e136927b9c7339f09842dbd3edb Mon Sep 17 00:00:00 2001 From: athkalia Date: Thu, 24 Sep 2015 18:28:32 +0300 Subject: [PATCH 4/4] Delete SquareAndroid.xml --- configs/SquareAndroid.xml | 245 -------------------------------------- 1 file changed, 245 deletions(-) delete mode 100644 configs/SquareAndroid.xml diff --git a/configs/SquareAndroid.xml b/configs/SquareAndroid.xml deleted file mode 100644 index bc6a103..0000000 --- a/configs/SquareAndroid.xml +++ /dev/null @@ -1,245 +0,0 @@ - - - - - - -