Skip to content

Commit

Permalink
Update Ice version in some files
Browse files Browse the repository at this point in the history
This reverts commit ffb4677.
  • Loading branch information
bentoi committed Apr 5, 2016
1 parent f277e2f commit 66ce5e6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cpp/Chat/qtClient/resources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<string>QtChatDemo</string>

<key>CFBundleShortVersionString</key>
<string>3.6.0</string>
<string>3.6.2</string>

<key>CFBundleIdentifier</key>
<string>com.zeroc.QtChatDemo</string>
Expand Down
6 changes: 3 additions & 3 deletions cpp/make/Make.rules
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# If Ice is not installed in the default location (/usr) set ICE_HOME to
# the Ice installation directory.
#
#ICE_HOME ?= /opt/Ice-3.6.1
#ICE_HOME ?= /opt/Ice-3.6.2


#
Expand All @@ -38,7 +38,7 @@
# If building with Ice-E and Ice-E is not installed in the default
# location (/usr) set ICEE_HOME to the Ice-E installation directory.
#
#ICEE_HOME ?= /opt/IceE-3.6.1
#ICEE_HOME ?= /opt/IceE-3.6.2

#
# The target operating system for the build, supported values are 'yocto'
Expand Down Expand Up @@ -74,7 +74,7 @@ HOST ?= arm-linux-gnueabihf
# is not set in your environment variables then change the following
# setting to reflect the installation location.
#
ICEE_THIRDPARTY_HOME ?= /opt/IceE-3.6.1-ThirdParty
ICEE_THIRDPARTY_HOME ?= /opt/IceE-3.6.2-ThirdParty

# ----------------------------------------------------------------------
# Don't change anything below this line!
Expand Down
2 changes: 1 addition & 1 deletion java/Database/library/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ NOTES:

http://dev.mysql.com/doc/refman/5.0/en/set-transaction.html

6. Add the Ice jar (ice-3.6.0.jar) and the location of the demo classes
6. Add the Ice jar (ice-3.6.2.jar) and the location of the demo classes
(build/classes/main) to your CLASSPATH.


Expand Down
4 changes: 2 additions & 2 deletions java/Ice/minimal/build.gradle.example
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ repositories {
// Uncomment to build against locally installed jars
//flatDir {
// name 'local'
// dirs '/opt/Ice-3.6.1/lib'
// dirs '/opt/Ice-3.6.2/lib'
//}
}

dependencies {
compile 'com.zeroc:ice:3.6.1'
compile 'com.zeroc:ice:3.6.2'
}

0 comments on commit 66ce5e6

Please sign in to comment.