Viewing all changes in revision 665.

Committer: Aleix Pol
Date: 2011-01-14 02:15:13 UTC
mfrom: <a title="Merged From 662.1.2" href="/~kubuntu-members/kross-interpreters/4.11/revision/662.1.2">(662.1.2)
Revision ID: git-v1:e3012eb83b137c023009eeedd358d4048c6da7b6

Merge branch 'master' of git.kde.org:kross-interpreters

Conflicts:
CMakeLists.txt

added added

removed removed