Commit Graph

2 Commits (e1db5726883c257acb35670d1db95999cdd07efc)

Author SHA1 Message Date
Marius Kintel af8c3ee9d1 Merge remote-tracking branch 'origin/master' into scintillaeditor
Conflicts:
	src/PlatformUtils.cc
2014-07-22 14:48:45 -04:00
Marius Kintel 28864037ee Split info() function into separate file as it depends on too many defines and external libs 2014-07-22 13:32:44 -04:00