Go to file
Travis Burtrum ba939d1be0 Merge remote branch 'upstream/master'
Conflicts:
	src/main/java/com/cypherx/xauth/xAuth.java
	src/main/java/com/cypherx/xauth/xAuthSettings.java
2011-07-31 13:39:34 -04:00
sql 1. Major refactor of database related classes. 2011-07-29 17:29:51 -04:00
src Merge remote branch 'upstream/master' 2011-07-31 13:39:34 -04:00
xAuth_v1 Preparing.. like a boss 2011-06-13 08:05:12 -04:00
.gitignore 1. Major refactor of database related classes. 2011-07-29 17:29:51 -04:00
pom.xml 1. Major refactor of database related classes. 2011-07-29 17:29:51 -04:00