Commit Graph

2 Commits

Author SHA1 Message Date
da16f06cbc stomped in changes done on nancy's dime
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@288 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-02 02:25:45 +00:00
b3b88bb194 - CEP: copy of engine so we can merge together some external changes.
- resolved project file conflict. using sperl's kdevelop config files.



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@287 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-02 02:21:37 +00:00