8 commits

Author	SHA1	Message	Date
Botanic	7d1c1f6dd5	fixed bad merge	2013-10-26 00:57:50 -07:00
Botanic	8eeb5d19ba	Merge	2013-10-26 00:50:56 -07:00
Matthew Lagoe	df3da6f99b	Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #37) ... Fix's for installer for AMS	2013-10-24 20:27:37 -07:00
Botanic	e5619e273b	Backed out changeset: 97505c669e04	2013-02-08 03:09:17 -08:00
Botanic	341e468d5b	Backed out changeset: 57d8f3733daf	2013-02-08 03:08:42 -08:00
Botanic	84701dfca3	fixed load form and character_cl	2013-02-07 15:04:28 -08:00
Botanic	2521f746d1	Fixed warning: multi-character character constant [-Wmultichar]	2013-02-07 12:19:00 -08:00
Botanic	ab608d2cfe	Fixed warning "unix_event_emitter.cpp:569:8: warning: 'KeySym XKeycodeToKeysym(Display*, KeyCode, int)' is deprecated (declared at /usr/include/X11/Xlib.h:1695)"	2013-02-07 03:27:12 -08:00