Files
XmlStats/.build.number
Pascal Koenig 70211f66b0 Merge branch 'stats2.0' into v0.4
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
2012-02-03 16:58:31 +01:00

4 lines
84 B
Plaintext

#Build Number for ANT. Do not edit!
#Fri Feb 03 16:29:04 CET 2012
build.number=72