diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-05-31 08:10:59 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-05-31 08:54:51 -0700 |
| commit | bbb37025b1c9055f3ad880ac570bb7625379740b (patch) | |
| tree | 918ccd6d27e0d5e5963aa8e657456ff1a45953c6 /.idea/libraries | |
| parent | 9b82a5a86313516e55b7a35dd559cd685f2b11ff (diff) | |
| parent | ec3fb1e06285c0467a7a20360ca80453bc7635d4 (diff) | |
| download | idea-bbb37025b1c9055f3ad880ac570bb7625379740b.tar.gz | |
Merge remote-tracking branch 'aosp/snapshot-master' into merge
Conflicts:
.idea/modules.xml
platform/external-system-impl/src/com/intellij/openapi/externalSystem/util/ExternalSystemUtil.java
platform/platform-impl/src/com/intellij/internal/statistic/StatisticsUploadAssistant.java
resources-en/src/tips/Welcome.html
Change-Id: I2798b45d4cc245f31b14a99b68df08075faf2f5c
Diffstat (limited to '.idea/libraries')
| -rw-r--r-- | .idea/libraries/Netty.xml | 4 | ||||
| -rw-r--r-- | .idea/libraries/protobuf.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.idea/libraries/Netty.xml b/.idea/libraries/Netty.xml index 3cf68ad0ae64..7cbf980422e9 100644 --- a/.idea/libraries/Netty.xml +++ b/.idea/libraries/Netty.xml @@ -1,11 +1,11 @@ <component name="libraryTable"> <library name="Netty"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/netty-3.6.3.Final.jar!/" /> + <root url="jar://$PROJECT_DIR$/lib/netty-3.6.6.Final.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$PROJECT_DIR$/lib/src/netty-3.6.3.Final-sources.jar!/" /> + <root url="jar://$PROJECT_DIR$/lib/src/netty-3.6.6.Final-sources.jar!/" /> </SOURCES> </library> </component>
\ No newline at end of file diff --git a/.idea/libraries/protobuf.xml b/.idea/libraries/protobuf.xml index ef5b16d4e716..36a6f963ac74 100644 --- a/.idea/libraries/protobuf.xml +++ b/.idea/libraries/protobuf.xml @@ -1,7 +1,7 @@ <component name="libraryTable"> <library name="protobuf"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/protobuf-2.4.1.jar!/" /> + <root url="jar://$PROJECT_DIR$/lib/protobuf-2.5.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> |