socrates/XmlStats
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'stats2.0' into v0.4

Browse Source 
Conflicts:
	.build.number
	src/de/sockenklaus/XmlStats/Datasource/StatsDS.java
	src/de/sockenklaus/XmlStats/Datasource/UsersDS.java
	src/de/sockenklaus/XmlStats/Objects/NodeCategories.java
	src/de/sockenklaus/XmlStats/Objects/NodeItems.java
	src/de/sockenklaus/XmlStats/Settings.java
	src/de/sockenklaus/XmlStats/XmlStats.java
	src/de/sockenklaus/XmlStats/XmlStatsServerListener.java
	src/de/sockenklaus/XmlStats/XmlWorkers/UserStats.java

Merged stats2.0 into v0.4
This commit is contained in:
Pascal Koenig
2012-02-03 16:58:31 +01:00
parent f424b3a76e 969b763e63
commit 70211f66b0
23 changed files with 222 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.build.number
View File

@@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Fri Oct 14 01:25:23 CEST 2011
build.number=66
#Fri Feb 03 16:29:04 CET 2012
build.number=72