4 Commits

Author	SHA1	Message	Date
Dander7BD	e6c5f1f6e5	Merge errors dealt with	2014-02-14 12:09:59 +01:00
Dander7BD	36c6689c7a	bug fixes	2014-02-14 11:37:20 +01:00
Dander7BD	49fc55be60	Textfield and Bunch of fixes	2014-02-14 09:40:53 +01:00
Dander7BD	cccaf68672	premerge	2014-02-13 15:21:02 +01:00