summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Rename additional header files to avoid conflicts with KDE4Timothy Pearson2013-02-15116-0/+0
* Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdeTimothy Pearson2013-02-140-0/+0
|\
| * Reset submodule main/applications/kaffeine to latest HEADAutomated System2013-02-141-0/+0
| * Reset submodule main/applications/k9copy to latest HEADAutomated System2013-02-141-0/+0
| * Reset submodule main/applications/gwenview to latest HEADAutomated System2013-02-141-0/+0
| * Reset submodule main/applications/gtk3-tqt-engine to latest HEADAutomated System2013-02-141-0/+0
* | Fix prior commitTimothy Pearson2013-02-14111-0/+0
|/
* Reset submodule tde-guidance to latest HEADTimothy Pearson2013-02-141-0/+0
* Reset submodule pytdeextensions to latest HEADTimothy Pearson2013-02-141-0/+0
* Reset submodule bibletime to latest HEADTimothy Pearson2013-02-141-0/+0
* Reset submodule main/libraries/libtdeldap to latest HEADAutomated System2013-02-141-0/+0
* Reset submodule bibletime to latest HEADTimothy Pearson2013-02-131-0/+0
* Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdeTimothy Pearson2013-02-132-0/+0
|\
| * Reset submodule main/libraries/libtdeldap to latest HEADAutomated System2013-02-131-0/+0
| * Reset submodule main/dependencies/qt3 to latest HEADAutomated System2013-02-131-0/+0
* | Reset submodule python-trinity to latest HEADTimothy Pearson2013-02-131-0/+0
|/
* Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdeTimothy Pearson2013-02-134-0/+0
|\
| * Reset submodule main/applications/kcmldapcontroller to latest HEADAutomated System2013-02-131-0/+0
| * Reset submodule main/applications/kcmldapmanager to latest HEADAutomated System2013-02-131-0/+0
| * Reset submodule main/applications/kcmldap to latest HEADAutomated System2013-02-131-0/+0
| * Reset submodule main/applications/bibletime to latest HEADAutomated System2013-02-131-0/+0
* | Automated update to latest HEADTimothy Pearson2013-02-131-0/+0
|/
* Automated reset to latest HEADTimothy Pearson2013-02-131-0/+0
* Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdeTimothy Pearson2013-02-131-0/+0
|\
| * Reset submodule scripts to latest HEADAutomated System2013-02-131-0/+0
* | Automated reset to latest HEADTimothy Pearson2013-02-131-0/+0
|/
* Automated reset to latest HEADTimothy Pearson2013-02-131-0/+0
* Automated reset to latest HEADTimothy Pearson2013-02-131-0/+0
* Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdeTimothy Pearson2013-02-1216-0/+0
|\
| * Reset submodule main/applications/kcmldapmanager to latest HEADAutomated System2013-02-121-0/+0
| * Reset submodule main/applications/kopete-otr to latest HEADAutomated System2013-02-111-0/+0
| * Reset submodule main/applications/konversation to latest HEADAutomated System2013-02-111-0/+0
| * Reset submodule main/applications/koffice-i18n to latest HEADAutomated System2013-02-111-0/+0
| * Reset submodule main/applications/koffice to latest HEADAutomated System2013-02-111-0/+0
| * Reset submodule main/applications/knutclient to latest HEADAutomated System2013-02-111-0/+0
| * Reset submodule main/applications/knowit to latest HEADAutomated System2013-02-111-0/+0
| * Reset submodule main/applications/knights to latest HEADAutomated System2013-02-111-0/+0
| * Reset submodule main/applications/knetworkmanager9 to latest HEADAutomated System2013-02-111-0/+0
| * Reset submodule main/applications/knetworkmanager8 to latest HEADAutomated System2013-02-111-0/+0
| * Reset submodule main/applications/knetstats to latest HEADAutomated System2013-02-111-0/+0
| * Reset submodule main/applications/knetload to latest HEADAutomated System2013-02-111-0/+0
| * Reset submodule main/applications/knemo to latest HEADAutomated System2013-02-111-0/+0
| * Reset submodule main/applications/kmymoney to latest HEADAutomated System2013-02-111-0/+0
| * Reset submodule main/applications/kmyfirewall to latest HEADAutomated System2013-02-111-0/+0
| * Reset submodule main/applications/kmplayer to latest HEADAutomated System2013-02-111-0/+0
* | Automated reset to latest HEADTimothy Pearson2013-02-122-0/+0
|/
* Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdeTimothy Pearson2013-02-110-0/+0
|\
| * Reset submodule main/applications/kiosktool to latest HEADAutomated System2013-02-111-0/+0
| * Reset submodule main/applications/kio-umountwrapper to latest HEADAutomated System2013-02-111-0/+0
| * Reset submodule main/applications/kio-apt to latest HEADAutomated System2013-02-111-0/+0