Skip to content

Commit

Permalink
Bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
madeye committed Dec 23, 2015
1 parent fcb368d commit a5a503c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.github.shadowsocks"
android:versionCode="125"
android:versionName="2.9.3">
android:versionCode="126"
android:versionName="2.9.4">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/com/github/shadowsocks/BaseService.scala
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ trait BaseService extends Service {

@volatile private var state = State.STOPPED
@volatile private var callbackCount = 0
@volatile protected var config: Config = null

var timer: Timer = null
var trafficMonitorThread: TrafficMonitorThread = null
var config: Config = null

final val callbacks = new RemoteCallbackList[IShadowsocksServiceCallback]

Expand Down

0 comments on commit a5a503c

Please sign in to comment.