Public Git Hosting - ailab2.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 148e8df 91553fe)

commit	3bd6c9b3457bf990ba5535f2de89f9bd8c8a6864
author	Victor Zamanian <victor.zamanian@gmail.com>
	Tue, 14 Oct 2008 15:14:23 +0000 (14 17:14 +0200)
committer	Victor Zamanian <victor.zamanian@gmail.com>
	Tue, 14 Oct 2008 15:14:23 +0000 (14 17:14 +0200)
tree	a98fad2423dbbc7b40bcdb10dc34968e3e4dc8a5	tree \| snapshot (tar.gz zip)
parent	148e8df6e4a97d13d8ffc039dbe2c70f1f0a79b6	commit \| diff
parent	91553fec138e1172752d5b49c7576f8696da19a6	commit \| diff

Merge branch 'master' of ssh://victor@repo.or.cz/srv/git/ailab2

Conflicts:
src/MySearcher.java
test/MySearcherTest.java

src/MySearcher.java	diff1 \|	diff2 \|	blob \| history
test/MySearcherTest.java	diff1 \|	diff2 \|	blob \| history

Artificial intelligence searching stuff.