Skip to content

Commit 12e11e0

Browse files
LayoricLayoric
committed
Merge branch 'master' into eclipse-to-maven
2 parents 49d4d00 + 7d6570d commit 12e11e0

18 files changed

+535
-462
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ proguard/
2727
src/ServiceStackIDEA/.idea/workspace.xml
2828
src/ServiceStackIDEA/lib/sdk/
2929
src/ServiceStackIDEA/lib/idea-sdk.zip
30+
src/ServiceStackIDEA/.idea/libraries
3031
linux.gtk.x86/
3132
linux.gtk.x86_64/
3233
macosx.cocoa.x86/

‎src/ServiceStackIDEA/.idea/libraries/Gradle__asm_asm_2_2_3.xml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/ServiceStackIDEA/.idea/libraries/Gradle__asm_asm_commons_2_2_3.xml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/ServiceStackIDEA/.idea/libraries/Gradle__asm_asm_tree_2_2_3.xml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/ServiceStackIDEA/.idea/libraries/Gradle__com_google_code_gson_gson_2_3_1.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/ServiceStackIDEA/.idea/libraries/Gradle__com_intellij_forms_rt_6_0_5.xml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/ServiceStackIDEA/.idea/libraries/Gradle__com_jgoodies_forms_1_0_7.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/ServiceStackIDEA/.idea/libraries/Gradle__jdom_jdom_1_0.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/ServiceStackIDEA/.idea/libraries/Gradle__junit_junit_4_11.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/ServiceStackIDEA/.idea/libraries/Gradle__org_apache_maven_maven_model_3_0_5.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)