Merge branch 'master' of lenovo.local:git/hs-java
authorIlya Portnov <portnov@iportnov.ru>
Sat, 19 May 2012 14:35:45 +0000 (20:35 +0600)
committerIlya Portnov <portnov@iportnov.ru>
Sat, 19 May 2012 14:35:45 +0000 (20:35 +0600)
commit4d1941510b85901ccfd7eaf94c56c13e7cfc1c20
treedeb20a63404b06862e0fbbb944326c19dac91c64
parentab7df4b6e9518cbedb49df5e510c3ababb64dada
parent480abc5f790688ae7572beadbf4fdf8dbc7135f7
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
hs-java.cabal