.gitattributes is has not effect
add org-mode
Merge branch 'linux-cfg' of https://github.com/tangling/EmacsConfig into windows-cfg
modified .emacs
Merge remote-tracking branch 'origin/windows-cfg' into windows-cfg
org-mode repaire
repaired install.bat on windows 7
Synchronizing with remote repository

commit b57e4e04d9a4b56e6ed4b36af401238411367009
Merge: 31c7931 1b6b0fe
Author: Tang Ling <tangling.life@gmail.com>
Date:   Sun Dec 2 20:53:56 2012 +0800

    merge windows-cfg common settings

commit 31c793106c714e14d6af7177810df3d4386f51a4
Author: Tang Ling <tangling.life@gmail.com>
Date:   Sun Dec 2 20:46:27 2012 +0800

    add .gitattributes

commit 7a9a8d9b40b1243b9855a8035cc938deb4b8625d
Author: tang ling <tangling.life@gmail.com>
Date:   Thu Nov 29 17:42:14 2012 +0800

    add keybind ctrl + a to format source code

commit ffafb17ec18801627a50bbc725f7c7e36b18c61d
Author: Tang Ling <tangling.life@gmail.com>
Date:   Wed Nov 28 22:11:59 2012 +0800

    Finish linux installation

commit 0b595f110dd25f5c8c406fbe14e3cd97d45ba64a
Author: tang ling <tangling.life@gmail.com>
Date:   Wed Nov 28 17:42:41 2012 +0800

    Initial intall.sh
Synchronized with remote repository
delete org-mode docs from current branch
install/install.bat
   repair window installer on win7
base-setting.el
   repare linum and max option
modification
Squashed commit of the following:

commit 21d5bef1e4852a6a69850546bad36ac7d8bff0ca
Author: Tang Ling <tangling.life@gmail.com>
Date:   Tue Dec 25 12:24:05 2012 +0800

    Conflicts:
    	.emacs
    	my-site-lisps/settings/color-themes-setting.el
org-mode setting, add pymacs
modified org-mode settings
Squashed commit of the following:

commit a8cd549c7a8afdc5b778f83502f2db502c3c9aea
Author: Tang Ling <tangling.life@gmail.com>
Date:   Sat Jan 5 17:55:53 2013 +0800

    modified org-mode settings

commit 2b44ea870aa42357771860739549ff485c14532c
Author: Tang Ling <tangling.life@gmail.com>
Date:   Sat Jan 5 13:21:02 2013 +0800

    org-mode setting, add pymacs

commit bb0bc4d94a4148ffa4d5798af97d4fbf09c21fe8
Author: Tang Ling <tangling.life@gmail.com>
Date:   Tue Dec 25 12:24:57 2012 +0800

    Squashed commit of the following:

    commit 21d5bef1e4852a6a69850546bad36ac7d8bff0ca
    Author: Tang Ling <tangling.life@gmail.com>
    Date:   Tue Dec 25 12:24:05 2012 +0800

        Conflicts:
        	.emacs
        	my-site-lisps/settings/color-themes-setting.el
Merge branch 'windows-cfg' of github.com:tangling/EmacsConfig into windows-cfg
add pymacs script folder
Squashed commit of the following:

commit c941a42d8e4f1d40424efcc523d3ab2cc64d15d1
Author: Tang Ling <tangling.life@gmail.com>
Date:   Sun Jan 6 09:46:17 2013 +0800

    Conflicts:
    	.emacs
    	my-site-lisps/settings/color-themes-setting.el
    	my-site-lisps/settings/python-mode-setting.el
correcting something