Merge remote branch 'origin/master'

This commit is contained in:
irengrig
2012-02-27 19:20:02 +04:00
5 changed files with 6975 additions and 3038 deletions
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
Binary file not shown.
Binary file not shown.
+1 -1
View File
@@ -45,4 +45,4 @@ xpp3-1.1.4-min.jar
xstream.jar
swingx-core-1.6.2.jar
netty-3.3.1.Final.jar
protobuf-2.3.0.jar
protobuf-2.4.1.jar