Merge.

2014-11-19 11:54:06 -06:00
parent 45f49d393e 14332b878c
commit 9887402b57
5 changed files with 244 additions and 60 deletions
--- a/project.properties
+++ b/project.properties
@ -1,6 +1,12 @@
+<<<<<<< HEAD
 #Sat, 11 Jan 2014 18:55:50 -0600
 name=jdb-util
 version=2.3
+=======
+#Wed, 29 Oct 2014 19:31:44 -0500
+name=jdb-util
+version=3.1
+>>>>>>> 14332b878ce29d57aee9bea47bc4e42ff4555612
 lib.local=true

 build.number=0