103 Commits

Author	SHA1	Message	Date
Martin Storsjö	55b82b3cd7	Rerun astyle on the C++ source files ... astyle was only run on .cpp files this time - already in ff6b66917 where the style cleanup was done initially, not all .h files seem to have gotten the same styling (rerunning astyle on .h files at that commit produces a huge diff).	2014-01-05 14:59:18 +02:00
Martin Storsjö	d3ee1de5ac	Remove trailing whitespace in comments ... The astyle cleanup keeps trailing whitespace within comments, but the whitespace here is not significant nor intentional and thus should be removed.	2014-01-05 14:53:21 +02:00
volvet	ec84f4bcc9	resolve conflict	2014-01-03 14:49:45 +08:00