Commit 55fa3759 authored by adwisatya's avatar adwisatya
Browse files

XMerge branch 'master' of http://gitlab.informatika.org/adwisatya/IF3230-Tugas-Besar-Sister-2015

Conflicts:
	src/client/TheAlchemistClient/build/classes/thealchemist/gui/AlcLogon.class
	src/client/TheAlchemistClient/src/thealchemist/gui/AlcLogon.java
parents 61ae1a2d 7644cdc1
#Sun, 26 Apr 2015 07:15:59 +0700
#Sun, 26 Apr 2015 17:11:20 +0700
F\:\\z~edo\\Kuliah\\Semester\ 6\\IF3230\ Sistem\ Paralel\ dan\ Terdistribusi\\Tugas\ Akhir\\src\\client\\TheAlchemistClient=
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment