5 Commits

Author SHA1 Message Date
Mihai Pitu
895ee4045e Revert "clea"
This reverts commit e477760edd9b8ded432f08fc62a58e576c788e07.

Conflicts:
	java/Makefile.am
2016-01-29 10:39:57 -03:00
Mihai Pitu
e90b6715ca clea 2016-01-29 10:39:57 -03:00
Mihai Pitu
3b92a030c7 merge upstream & update configs 2016-01-29 10:39:57 -03:00
Mihai Pitu
7ff4e465bf changes 2016-01-29 10:39:56 -03:00
Mihai Pitu
e1cd024c26 configs 2016-01-29 10:39:56 -03:00