From: Ilya Portnov <portnov@iportnov.ru>
Date: Sat, 19 May 2012 14:35:45 +0000 (+0600)
Subject: Merge branch 'master' of lenovo.local:git/hs-java
X-Git-Tag: v0.3.2~10
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=hs-java.git;a=commitdiff_plain;h=4d1941510b85901ccfd7eaf94c56c13e7cfc1c20

Merge branch 'master' of lenovo.local:git/hs-java

Does not compile!

Conflicts:
	Java/ClassPath.hs
	Java/ClassPath/Common.hs
	Java/JAR/Archive.hs
	hs-java.cabal
---

4d1941510b85901ccfd7eaf94c56c13e7cfc1c20
diff --cc hs-java.cabal
index a3b9182,b362227..0641f54
--- a/hs-java.cabal
+++ b/hs-java.cabal
@@@ -11,6 -11,8 +11,7 @@@ Build-Type:     Simpl
  Description:    This package declares data types for Java .class files format and functions
                  to assemble/disassemble Java bytecode. See dump-class.hs, rebuild-class.hs,
                  TestGen.hs for examples of usage.
 -
+ Bug-reports: http://home.iportnov.ru:3000/projects/hs-java/
  
  Extra-source-files: dump-class.hs
                      rebuild-class.hs