fergalmoran/settings-webstorm
1
0
Fork 0
mirror of https://github.com/fergalmoran/settings-webstorm.git synced 2025-12-22 09:47:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflicts

Browse Source
This commit is contained in:
Fergal Moran
2015-10-25 15:34:53 +00:00
parent 46953bcaaa b2c0d58d9f
commit 1c3c2689d5
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bash_profile
View File

@@ -1,3 +1,4 @@
[ -s "/home/fergalm/.dnx/dnvm/dnvm.sh" ] && . "/home/fergalm/.dnx/dnvm/dnvm.sh" # Load dnvm
[ -s "/home/fergalm/.kre/kvm/kvm.sh" ] && . "/home/fergalm/.kre/kvm/kvm.sh" # Load kvm
#
# NODE-COMPLETE

2
bashrc
View File

@@ -120,7 +120,7 @@ fi
export ANDROID_SDK=/opt/android-sdk-linux/
export PATH=$PATH:/opt/android-sdk-linux/tools:/opt/android-sdk-linux/platform-tools/
export PATH=$PATH:/opt/android-sdk-linux/tools:/opt/android-sdk-linux/platform-tools/:/opt/genymotion
export SENCHA_CMD_3_0_0="/home/fergalm/dev/sencha/Sencha/Cmd/4.0.0.203"
export PATH=$SENCHA_CMD_3_0_0:~/bin/:$PATH
export OPENNI2_INCLUDE=/home/fergalm/dev/kinect/lib/OpenNI-Linux-x64-2.2/Include