removing extra folder

kul3r4 · Mar 23, 2015 · cdb9acf · cdb9acf
1 parent dd56cbf
commit cdb9acf
Show file tree

Hide file tree

Showing 44 changed files with 0 additions and 25 deletions.
diff --git a/droidConf/.bowerrc → .bowerrc b/droidConf/.bowerrc → .bowerrc
diff --git a/droidConf/.editorconfig → .editorconfig b/droidConf/.editorconfig → .editorconfig
diff --git a/droidConf/.gitignore → .gitignore b/droidConf/.gitignore → .gitignore
diff --git a/droidConf/.travis.yml → .travis.yml b/droidConf/.travis.yml → .travis.yml
diff --git a/droidConf/bower.json → bower.json b/droidConf/bower.json → bower.json
diff --git a/droidConf/build.gradle → build.gradle b/droidConf/build.gradle → build.gradle
diff --git a/droidConf/londonWeatherAcceptance/londonWeatherAcceptance.iml b/droidConf/londonWeatherAcceptance/londonWeatherAcceptance.iml
diff --git a/droidConf/londonweatherlib/londonweatherlib.iml b/droidConf/londonweatherlib/londonweatherlib.iml
diff --git a/droidConf/gradle.properties → gradle.properties b/droidConf/gradle.properties → gradle.properties
diff --git a/droidConf/gulpfile.js → gulpfile.js b/droidConf/gulpfile.js → gulpfile.js
diff --git a/droidConf/londonWeather/.gitignore → londonWeather/.gitignore b/droidConf/londonWeather/.gitignore → londonWeather/.gitignore
diff --git a/droidConf/londonWeather/build.gradle → londonWeather/build.gradle b/droidConf/londonWeather/build.gradle → londonWeather/build.gradle
diff --git a/droidConf/londonWeather/proguard-rules.pro → londonWeather/proguard-rules.pro b/droidConf/londonWeather/proguard-rules.pro → londonWeather/proguard-rules.pro
diff --git a/...appini/londonweather/ApplicationTest.java → ...appini/londonweather/ApplicationTest.java b/...appini/londonweather/ApplicationTest.java → ...appini/londonweather/ApplicationTest.java
diff --git a/...ondonWeather/src/main/AndroidManifest.xml → londonWeather/src/main/AndroidManifest.xml b/...ondonWeather/src/main/AndroidManifest.xml → londonWeather/src/main/AndroidManifest.xml
diff --git a/...chiappini/londonweather/MainActivity.java → ...chiappini/londonweather/MainActivity.java b/...chiappini/londonweather/MainActivity.java → ...chiappini/londonweather/MainActivity.java
diff --git a/...appini/londonweather/WeatherActivity.java → ...appini/londonweather/WeatherActivity.java b/...appini/londonweather/WeatherActivity.java → ...appini/londonweather/WeatherActivity.java
diff --git a/...her/src/main/res/layout/activity_main.xml → ...her/src/main/res/layout/activity_main.xml b/...her/src/main/res/layout/activity_main.xml → ...her/src/main/res/layout/activity_main.xml
diff --git a/.../src/main/res/layout/activity_weather.xml → .../src/main/res/layout/activity_weather.xml b/.../src/main/res/layout/activity_weather.xml → .../src/main/res/layout/activity_weather.xml
diff --git a/...onWeather/src/main/res/menu/menu_main.xml → ...onWeather/src/main/res/menu/menu_main.xml b/...onWeather/src/main/res/menu/menu_main.xml → ...onWeather/src/main/res/menu/menu_main.xml
diff --git a/...eather/src/main/res/menu/menu_weather.xml → ...eather/src/main/res/menu/menu_weather.xml b/...eather/src/main/res/menu/menu_weather.xml → ...eather/src/main/res/menu/menu_weather.xml
diff --git a/.../src/main/res/mipmap-hdpi/ic_launcher.png → .../src/main/res/mipmap-hdpi/ic_launcher.png b/.../src/main/res/mipmap-hdpi/ic_launcher.png → .../src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/.../src/main/res/mipmap-mdpi/ic_launcher.png → .../src/main/res/mipmap-mdpi/ic_launcher.png b/.../src/main/res/mipmap-mdpi/ic_launcher.png → .../src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png b/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png b/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/...eather/src/main/res/values-v21/styles.xml → ...eather/src/main/res/values-v21/styles.xml b/...eather/src/main/res/values-v21/styles.xml → ...eather/src/main/res/values-v21/styles.xml
diff --git a/...her/src/main/res/values-w820dp/dimens.xml → ...her/src/main/res/values-w820dp/dimens.xml b/...her/src/main/res/values-w820dp/dimens.xml → ...her/src/main/res/values-w820dp/dimens.xml
diff --git a/...donWeather/src/main/res/values/dimens.xml → londonWeather/src/main/res/values/dimens.xml b/...donWeather/src/main/res/values/dimens.xml → londonWeather/src/main/res/values/dimens.xml
diff --git a/...onWeather/src/main/res/values/strings.xml → ...onWeather/src/main/res/values/strings.xml b/...onWeather/src/main/res/values/strings.xml → ...onWeather/src/main/res/values/strings.xml
diff --git a/...donWeather/src/main/res/values/styles.xml → londonWeather/src/main/res/values/styles.xml b/...donWeather/src/main/res/values/styles.xml → londonWeather/src/main/res/values/styles.xml
diff --git a/...Conf/londonWeatherAcceptance/build.gradle → londonWeatherAcceptance/build.gradle b/...Conf/londonWeatherAcceptance/build.gradle → londonWeatherAcceptance/build.gradle
diff --git a/...ceptance/LondonWeatherAcceptanceTest.java → ...ceptance/LondonWeatherAcceptanceTest.java b/...ceptance/LondonWeatherAcceptanceTest.java → ...ceptance/LondonWeatherAcceptanceTest.java
diff --git a/droidConf/londonweatherlib/.gitignore → londonweatherlib/.gitignore b/droidConf/londonweatherlib/.gitignore → londonweatherlib/.gitignore
diff --git a/droidConf/londonweatherlib/build.gradle → londonweatherlib/build.gradle b/droidConf/londonweatherlib/build.gradle → londonweatherlib/build.gradle
diff --git a/.../src/main/java/weather/WeatherOracle.java → .../src/main/java/weather/WeatherOracle.java b/.../src/main/java/weather/WeatherOracle.java → .../src/main/java/weather/WeatherOracle.java
diff --git a/.../test/java/weather/WeatherOracleTest.java → .../test/java/weather/WeatherOracleTest.java b/.../test/java/weather/WeatherOracleTest.java → .../test/java/weather/WeatherOracleTest.java
diff --git a/droidConf/package.json → package.json b/droidConf/package.json → package.json
diff --git a/droidConf/settings.gradle → settings.gradle b/droidConf/settings.gradle → settings.gradle
diff --git a/droidConf/src/images/idea.jpg → src/images/idea.jpg b/droidConf/src/images/idea.jpg → src/images/idea.jpg
diff --git a/droidConf/src/images/my-idea.jpg → src/images/my-idea.jpg b/droidConf/src/images/my-idea.jpg → src/images/my-idea.jpg
diff --git a/droidConf/src/index.jade → src/index.jade b/droidConf/src/index.jade → src/index.jade
diff --git a/droidConf/src/orig-index.jade → src/orig-index.jade b/droidConf/src/orig-index.jade → src/orig-index.jade
diff --git a/droidConf/src/scripts/main.js → src/scripts/main.js b/droidConf/src/scripts/main.js → src/scripts/main.js
diff --git a/droidConf/src/styles/main.styl → src/styles/main.styl b/droidConf/src/styles/main.styl → src/styles/main.styl