labofsahil/github-event-dataset-2012 huggingface dataset:
fixed #1520: Added comments for using multiresolution in HelloCpp.
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1520-comments
fixed #1520: Updated some comments.
fixed #1520: Updated one comment in HelloCpp.
issue #1521: Using relative coordinates in TestCpp.
fixed #1522: CCEGLView class of desktop platforms should override CCEGLViewProtocol::setScissorInPoints.
fixed #1512: add VisableRect.cpp/h into iOS and mac project
Merge pull request #3 from minggo/zoom-scale

fixed #1512: add VisableRect.cpp/h into iOS and mac project
Merge pull request #1490 from dumganhar/iss1521-relative-pos

fixed #1521: Using relative coordinates in TestCpp.
Merge pull request #1492 from dumganhar/iss1522-clip

fixed #1522: CCEGLView class of desktop platforms should override CCEGLViewProtocol::setScissorInPoints.
Merge pull request #1488 from dumganhar/iss1520-comments

fixed #1520: Added comments for using multiresolution in HelloCpp.
Removed some unused codes about "enableRetinaDisplay".
Removing :
it told me to
just trying to get it to work
click to make balls
adding yui resetcss, changing templates
minor fix
implemented class yui
minor changes
minor fix
minor fix
Merge branch 'dev' of https://github.com/dynaclic/jqCalendar into dev
some fixes
Merge branch 'dev' of https://github.com/dynaclic/jqCalendar into dev
player/sounds end of Kit3 sounds
Merge branch 'master' of github.com:ebausson/Penduluino
Merge branch 'master' of github.com:ebausson/Penduluino
Merge branch 'master' of github.com:ebausson/Penduluino
handle 6 planets
reverting back to 0.12 tycho
Use AOS repository instead of nexus ones for distribution
cozinha Castelo
doctype HS online home
fixed issues with mongo restore
fixed/added routely responses

- fixed wrong content type for plain text
- added an html response for rending template
Fleshed out XML and basic structure. Added XML I/O test.
Added gitignore
Super nice clean main()s by putting things into Start
Fixed error message
Updated the docs a bit
Starting database tests
fix comment
percolate :number
debug instrumentation
comments & cleanup
Update grants documentation
Fixed pre-format typo
Make it possible to not inline a set of styles so you can have media queries
Add a states directory to the template.
Correções na lincença
Read me file add
BUG: Remove obsolete code path.
ENYO-1335: convert leading spaces to leading tabs

Enyo-DCO-1.1-Signed-off-by: Francois-Xavier KOWALSKI <francois-xavier.kowalski@hp.com>
ENYO-1335: HermesFileTree: verbose event propagation when debug===true

Enyo-DCO-1.1-Signed-off-by: Francois-Xavier KOWALSKI <francois-xavier.kowalski@hp.com>
ENYO-1335: HermesFileTree: get projectPath using PROPFIND

- …instead of converting the said-to-be-opaque fileId from
  URL-encoded into text
- consequently, fileId can be used again to carry ID's generated by
  other storage back-end services.

Enyo-DCO-1.1-Signed-off-by: Francois-Xavier KOWALSKI <francois-xavier.kowalski@hp.com>
Merge branch 'master' into ENYO-1335

Conflicts:
	ares/Ares.js
missed in last commit
move css to to ares.css

move css out to ares.css
fix spelling

fix spelling error
clean up code
rename popup to textShadowPopup

rename popup to textShadowPopup
add no repeat check box  and rename functions
Wired up no repeat /repeat y and repeat x
reset  the image setting on reset
fix popup spelling error
Merge remote-tracking branch 'upstream/master' into ares-css-work
move css back in to it file
Merge branch 'ares-css-work' of https://github.com/micro-tech/ares-project into micro-tech-ares-css-work
Remove duplicated CSS classes from Ares.css
ENYO-1108: updated chrome-app manifest.json

Enyo-DCO-1.0-Signed-off-by: Francois-Xavier KOWALSKI <francois-xavier.kowalski@hp.com>
Theme: meta name
remove word centre
[gh-211] Only run $.keyup once
Updated all apps/, removing releases
Updated publisher to modern state
Добаил тестовый файл
Fixed console logs and set default id
Added run script to update submodules on build
No Longer Require SQLite3
First attempt at fixing collisions with credpaths
When sending creds if the credpath is not there create it, instead of deleting the credpath regardless
Check for admin_cred_dir and log a message if it exists
Change python binary in shebang
Seperate ec2 and s3 operations into seperate files put euca specific functions in the Eucops class
Add license header
Add license header
Add license header
Add license header
Change ephemeral check to look for No such file or directory rather than just looking for the ephemeral path due to a possible false positive
Fixes to bootstrapping
Fix exception string print
Add support for multicluster
Fix get_all_zones call
Try to use XMLTestRunner
Add XMLTestRunner to eutester
Fix using xmlrunner
More cleanup to credential acquistion, cleanup for concurrency
Wait for IP to clear from all zeroes before trying to connect to instances
Check for full path of creds.zip
Fix debug method in run_with_args, catch exception when unable to read config file,  fix typos
Add distinct keypair prefix
Mark instances as unreachable if private_addressing is True. Do not
try to ping unreachable instances to verify connectivity.
Merge remote-tracking branch 'upstream/testing' into upstream-testing
Merge pull request #62 from eucalyptus/testing

Merge fix for private addressing
добавлена 5 лекция
Rename scatter_shared to scatter
Cleanup proxying capistrano commands

* Rewrite Scatter as a base class
* Extend Scatter for deploy and cap functions
set :rails_env to environment config variable
bump version number
Merge pull request #1 from evanwhalen/es/deployDateFix

Es/deploy date fix
Funcionalidades completas de agregar, y edicion de cine terminada
[~] remove comment
Group URL params can now take multiple values

Such as &param[name]=1&param[name]=2
Send next Sunday's bible passage to Kindle

For my priest friend, sends next sunday's bible reading passages in
hungarian to his Kindle (yay, a modern priest).

Requires Gmail account to send email (using SMTP).
Fixed #15628: 5th argument () of eZOperationHandler::execute is not handled
Merge pull request #387 from ezsystems/fix-15628

Fixed #15628: 5th argument of eZOperationHandler::execute is not handled
Add voting on micropost and sort options for the home feed
baseロールにユーザ追加
baseロールにユーザ追加
Corrigindo o script de criacao dos pontos no mapa.
changes to guess model
Merge branch 'master' of github.com:felixtsai/Miss-Cleo
Bugfix for Feature-Logout forever
basic graphics setup with 2 triangles
Fixed spacer image
a little translation into a Russian
Some comment and questions
overload protected function beforeSave() in Goods (for auto-fill data,owner_id)
add separated data (5 goods on the page)
Merge pull request #34 from chromigo/Translation,Functional

a little translation into a Russian+ some functional
separated multipleFileUpload Control
prepaird statement fix
moved templates to subfolder
bootstrap files added
temp images for apple icons
favicon temps
bootstrap first steps
bootstrap style
added breadcrumb
bootstrap-style breadcrumb generation
added TCA
added typoscript
added basic repository interaction
__init__.py created for the library direktory
Screen width and height is now taken from the surface provided to draw()
added docstrings documenting the module
Added post images to templates.
After running tests, exit with PHPUnit's exit status.
- make the "new arch" section reflect reality.

 - remove the pathname for qmanager invocations.  What
   was there was only true for the old codebase.

 - tune up the "required ports for a head node" section.


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@39040 ba62deef-0ea0-e111-9166-001e4f0fb9b1
Add Imaginary Landscape, LLC. for their monetary contributions to FreeBSD
development.
Add back one of my hats since I seem to be sticking with it for now.
YAMFC (and remove an entry pending resolution of namespace issue).
Merge 1.43 -> 1.44 delta from -current so RELENG_2_2 users get info
about the packages they need.
Whups!  This commit got lost somehow, no wonder pds was confused! :-}
YAMFC: Update FAQ with sysmouse section, add comment before
mousedtype setting in sysconfig.
Add some details about how to install Intel microcode updates.

Approved by:	bcr
PR:     www/168218

Add Tier1 Hosting Solutions to our ISP list.

Requested by:           Lanny (lbaron att tier1hosting dott net)


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@39137 ba62deef-0ea0-e111-9166-001e4f0fb9b1
- Remove a broken link in the 9.0R hardware release notes webpage.
- Make SVN happy with fbsd:nokeywords set on the file.

PR:		docs/170814
Approved by:	gjb (mentor)


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@39464 ba62deef-0ea0-e111-9166-001e4f0fb9b1
bug 479 - typo in database.sql
rev update
Merge https://github.com/friendica/friendica into pull
really fix it this time...

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  viewsrc: return only body if page is requested via ajax

* master:
Merge pull request #183 from simonlnu/master

final pull req for now. really fixed.
move tag transformation to bb2diaspora; start taking out unnecessary signature stuff
Merge pull request #431 from fermionic/diaspora-relays-and-tags

Couple of Diaspora fixes
test $.mockjaxClear()
Preparing for tinymce
AdaBoost realized
Fixed old back reference
Add Asp.net MVC jQuery.form.js upload
Use stream_copy_to_stream in Stream::pipe()
Use stream_get_contents in Stream::getContent()
Merge pull request #1 from igorw/native-functions

Using native functions instead of re-implementing them
additional changes to ldap docs, and revised images for same
Merge pull request #20 from galstrom21/master

Version bump for begining of the sprint
Fix Death Knight T8 Melee 4P Bonus and Death Knight T10 Tank 2P Bonus.
Removed bin and obj files from BL
Actualizamos la página con la nueva tabla y un solo js
update view for iPad
Merge remote-tracking branch 'origin/master'
add test
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' (reverse-merged from commit fefe560b560a338997cac4bae917f2fc67b22df4)
update result controller.
Merge remote-tracking branch 'origin/master'
added the pony logo
Merge branch 'master' of https://github.com/cportugal/ourdictionary into cportugal-master

Conflicts:
	templates/base.html
	wordviewer/static/styles/style.css
fix URL to CKEditor
upgrade to query 1.6.4 in devise too
Core/Movement: Do not process server side relocation if reading movementinfo from client resulted in violations (= hacking).
Fix for pets moving from stay during combat

Closes #5612
Pet UI - Fix for "Attack" continues to flash after combat end

Closes 5551
Guild bank - Allow deposit / withdraw money without tabs

closes 5637
Core/Unit: Fix some movement issues when leaving vehicles introduced in dce0a7d18423ecb36ebc0d8c3426dbec26fa9fff

Sorry about that.
Core/Spells: finish fixing dispel functionality. closes #5745
Merge pull request #5742 from MrSmite/PetAI_1

Core/Pets: Correctly obey the stay command for pets when attacking in melee range
Merge pull request #5743 from MrSmite/PetAI_2

Core/Pets: Fix the Attack button to stop flashing after combat end
Merge pull request #5733 from GyxTom/master

Core/Script: Clean-ups in scripts
Core/InstanceScript: Encounterframe research - extended the EncounterFrameType enum
Core/Movement: Fix brackets in macro
Core/Movement: Remove MOVEMENTFLAG_FLYING on fly aura unapply as well as _CAN_FLY
Core/Protocol: And correct the struct of SMSG_UPDATE_INSTANCE_ENCOUNTER_UNIT...
Merge pull request #5744 from MrSmite/Guild_1

Core/Guilds: Allow deposit / withdraw money in guild banks without having tabs
Pet - Fix focus regen gets stuck due to lag/high diffs

closes #5153
Core/Script: Code style and remove unused core.

Signed-off-by: Gyx <2359980687@qq.com>
Core/Script: Code style and remove unused core.

Signed-off-by: Gyx <2359980687@qq.com>
Core/Movement: Add debug output to Worldsession::ReadMovementInfo to find out which movementflag restriction was violated. Please use this to give feedback.
Update src/server/game/Server/WorldSession.cpp
Update src/server/game/Server/WorldSession.cpp
windows specific build and work

merge from windows rep
- closing streams on resourcepools
Fix issue loading stats for 4 part s2gs files.
add dmenu
change file manager to nautilus
change web to tag 3;add luakit to web
change default layout to align right
Just model tests
Limit Style Stats insights to run only on Saturdays
new dev env
Added a function to the app.js
Logo change (perhaps low res in sprite)
New text branding: GAIN Index
redone the sprite
fixed link on main page
Branding GAIN vs GAIN Index
More tweet out updates
button linewidth fix
Todo snippets for Python mode.
Use auto-complete from el-get.
Added publich script
First pages commit
Update all reports to showcase new format
Update HTML reports for real this time
Remove apidocs directory in the wrong place
Regenerate pages
Merge branch 'gh-pages' of https://github.com/gotwarlost/istanbul
Adjusted logging verbosity
Removed blank logging lines
Added better organization for compare output
Added progress counter to rename output
Cleaned up rename output based on logging level
Merge branch 'master' of git://github.com/rickatnight11/mediarenamer
Fixed int + str concatenation
Added readme
Added an error check
Added BUGS section to README
adding ability to run offline, for development
Merge remote-tracking branch 'origin/master'
DRYness
can swap letters in tray now, we were just doing the data structure swap too early
Fix syntax error in the command_line guide [ci skip]
Change query pattern case insensitive
because Oracle adapter uses upper case attribute/column name.
Merge pull request #7782 from yahonda/case_insensitive_test_for_partial_inserts

Change query pattern case insensitive
Assets cache shouldn't be shared between different environments
Changed test names to match proper context
Merge pull request #7783 from guilleiguaran/namespace-assets-cache-store

Assets cache shouldn't be shared between different environments
Update minitest dependency to ~> 4.0
Merge pull request #7787 from sferik/update_minitest

Update minitest dependency to ~> 4.0
Merge pull request #7784 from morgoth/proper_test_names_for_assertions

Changed test names to match proper context
small refactoring of build_relation in uniqueness

reflection init as 'if' stantment.
column is always the same expression and depends from the changing of attributes
`assert_template` no more passing with what ever string that matches.

Given Im rendering an template `/layout/hello.html.erb`, assert_template was
passing with any string that matches. This behavior allowed false passing like:

	assert_template "layout"
	assert_template "out/hello"

Now the passing possibilities are:

	assert_template "layout/hello"
	assert_template "hello"

fixing assert_template bug when template matches expected, but not ends with

Cherry Pick Merge: Fixes issue #3849 assert_template false positive

taking redundant test off

prevening incorrect assert_template when rendering with repeated names in path

updating CHANGELOG with bugfix: assert_template false passing
Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased

REBASED: fixing assert_template bug when template matches expected, but not ends with
Whitespaces :scissors: [ci skip]
Merge pull request #7791 from acapilleri/build_association

small refactoring of build_relation in uniqueness
new questions
Merge pull request #258 from abhinavc/master

new questions
[cron-git-commit] @ 21.48
Fix bug main

Penser à ajouter les associations dans les deux sens.
Ex:
Avant d'ajouter un séjour à un patient, je set le pateint su séjour
add objet pour test : main
TitulaireService et TypeSoinService ok
Merge branch 'master' of https://github.com/lilmo/Yakhospital
Dépendances dans les deux sens
Merge branch 'master' of https://github.com/lilmo/Yakhospital
Service + ServiceService
Merge branch 'master' of https://github.com/lilmo/Yakhospital
correction Service + ServiceService
Soin
add assoc pour test : main
Merge branch 'master' of https://github.com/lilmo/Yakhospital
update main
Ajout de méthodes pour PatientService

Et aussi: static --> public static
Merge branch 'master' of https://github.com/lilmo/Yakhospital
Modif de mes classes
update2 main
Merge branch 'master' of https://github.com/lilmo/Yakhospital
CascadeTypes corrigés + Nouveau mainService
MainBase + MainService
IEEE address is stored in EEPROM and may be changed via ZCL. Closes #90.
changed fatal/1 to fail/1
PM Suspend Fix bug in suspend statistics update - Srivatsa S. Bhat
fixed zombie-turning
Update src/OrderImport/XmlReader.cs

Hello  Mr Gerald
actually it took more than the 30m that the test was supposed to take for one reason, beside of the error already existing on the code,
when i ran the project using visual studio 2012 web development i had an exception thrown saying that the library (OrderImport.dll) could`t
be loaded.




After a while i had to recreate the solution you provided and put on one file just for test matter, and it worked well (attached to this email) .




Now i had to deal with the problem you wanted to be resolved at the origin , so this is how i proceeded.




I checked the c# code first very quickly and seemed to be OK after that the aspx file, which was fine too; this being done I was able to run the project.




 I tried the xml files included in the solution , the first one worked well but the second caused an exception to be thrown (as it was mentioned in the test description) during the parsing .
I went to the line 24 of the file  (it was shown on the exception message.)




The exception was caused by the using of the character  "&" which is not allowed in XML and was fixed by replacing it by the
 predefined entity "&amp;" instead to display it ; so I changed it and it worked very well .
It took me actually 20sec to find the cause of the exception.
now we need to find a better solution than changing these character manually especially when we have a massive amount of data and files to deal with.




The first solution that came to my mind was to impose some validation rules or replacing these entity references by their valid equivalences when entering the data at the first place , but understanding that we may have to use XML files coming from different origins and sources this solution was no longer one to our problem.




Within different options, i have chosen to work with regular expressions.
We will look up for any  "&" character (not followed by "amp;", "apos;", "quot;", "lt;" or "gt;") and replace it by "&amp;" , we can do the same job with the other unwelcome characters (',",<,>).
What makes this solution suitable is the limited number of entity references in XML  compared to the more than 250 existing in HTML.
Better default text.
Reorganizing and commenting the Guest class.
Trying to fix up the gitignore file to remove user files
remove extra .js for windoww
Fixed proxy toString and getName methods.
Fixed eviction when map store is configured and disabled.
Improved TcpIp joiner interface matching.
memtest now accepts a command line argument
config folder commit
Fix boosting

Add another timer to track how long until the player can boost again (as
opposed to the timer which tracks how long the player moves at increased
speed)
fix scan() modifying the given string + add tests
Removed implicits from Try
SI-6185 - add "prepare" hook to ExecutionContext

Enables important abstractions to be built on top of futures,
such as Twitter's "Local" for handling data local to a callback chain.
added lightning laser type to drones, will add to turrent
samples and DNS
more samples and appendix
support static game extension interfaces
Add script to rebuild launch services database.

This is simply a wrapper around the single line call referenced at
http://lifehacker.com/5708820/how-to-clean-up-your-macs-open-with-contextual-menu
but with echo statements to inform the user.
update actions.sfp, types.sfp
Merge branch 'master' of github.com:herry13/SFp-planner
Improved curd-related functionality
creating admin referrals screens
body transition failed
added roi match button features to comparer, fixed QApplication bug in Qt4Plot, fixed bugs related to olympus file import (not ready yet)
Merge remote-tracking branch 'origin/master'
Added diagnostic tests
group view from settings
updated acpi-handler to control brightness for Acer S3
Fixed hotkeys for aircraft
updated LICENSE to BSD
将所有笔记移过来
emacs: fix for fontlock of chars

- fixed: '\'' and '''
- added support for: '\u00AF'
- made regexp of chars stricter and to only allow escapes in scala specification,
  i.e. '\a' is not highlighted as char because \a is not a valid escape
I have made the circle move to where the user taps the screen.  Note: crashes when the user goes home then returns.
확실히 ReadingAsk부분이 망가진 듯.
draw에서 이미지가 원치 않는곳에 도착하는 현상을 수정

ㅋ
آپلود فایل های سمت سرور

فایل های پی اچ پی سمت سرور
Bild CSS fix

Lade till margin på bilden i content.
Making (reverse) geocoding requests work.
Add a new parameter output.manifest_force to force generation of manifest file
Added log folder in resources.
pass make distcheck
First mile with dropwizard
Merge pull request #1 from andreisavu/master

Some code with dropwizard
simplify connection management.
Update README.md

Github killed the download tab. Goodbye download stats.
another new algorithm
kevins awesome commit
fix r19
ignore xcuserdata
Merge pull request #1 from index/greg_update_git_ignore

ignore xcuserdata
Revert "Revert "region search use class description properties for feature types""

This reverts commit 9fcef94ca9bea9a638e7b71b4235f3b111d65e83.
update interaction keys
adds a publication
Fixed some variable-scoping issues
Fixed to ensure that threadID is passed through
Current threadID now passed
Added include for mongo gem - may be required later
Added MongoMapper::EmbeddedDocument. Oops!
Checked the request parameters echoed back in the response for a GET JSON Ajax request in the unit tests for oj.ajax.
Finished dirty drawing clear area for projectiles
Problem 33 moved
comments css is ok now
Preparing release 0.0.0
Back to development: 0.0.1
Fix MANIFEST
Preparing release 0.0.1
Back to development: 0.0.2
extensive rework, including terrible discussion of 'turning completeness'
uploading the source files.
configure application to use CDbHttpSession
Fix for z-index with fade effect - v1.0.5.1
Initial build

Construcing basic framework
Navigation and Breadcrumbs and Various Fixes
- Improved signup flow (validates email before allowing registration)
- Added reset password functionality
- Added email notifications
- Added a way to customise views  & mails (TemplatesPlugin)
- Added a setting to enable HTTPS in the URLSs for OAUTH callbacks and routes
- Replaced displayName in SocialUser for firstName, lastName and fullName fields.
Merge branch 'master' of github.com:jaliss/securesocial
bug-15897: Fix for OutOfMemoryError with files over 500mb
bug-16097: Unit tests for SendUtils
bug-16101: Changing Producer methods to take File or String
bug-16125: Unit tests for processSend in JALUtils
Issue #94 by @jamesiarmes: Removed EWSType:: and abstract constructor.
Issue #94 by @jamesiarmes: Removed __construct() from all EWSType implementations.
Merge pull request #98 from jamesiarmes/ewstype-constructor

Issue #94 by @jamesiarmes: Remove EWSType Constructors
Center the dispGol diagram in index.html
Added more text.
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/index.php
ADDED: Cure functionality
adding a gemspec...

keeping this as simple as possible... just your basic run of the mill
gemspec.
More pictures and trailers
More pictures and trailers
bold and invert status line so it shows up better in macvim
Added unit tests and documentation for new User functions
Fixed schema and navigation
UI Updates
home 16.08.12
home 16.08.12 1
Increase number of cycles so program can complete.
Enable basic exception handling.  Currently, the only kind of exception than can be handled is an unaligned memory access.
Modificación del CSS para las pantallas con listados
improve no and yes issue#12
Merge pull request #18 from jchubber/noyes

improve no and yes issue#12
Rework arguments for git-pull-request.

Forcing the types for the CLI arguments.

Removing the requirement for providing a pull request title or description. The title defaults to the branch name, and the description defaults to an empty string.

Closes GH-86
Updates to the Gem spec.
No longer tries to log not finding remote branches
Cleaned up root directory
Reconfigured Gemfile, updated Rails to 3.2.8, added new config options to environment files
Upgraded zurb foundation gem
Removed API secret wtfff
Migrated to new oauth2 login
Removed public/assets
Resolved issue with missing URI after logout
Added fabricator gem
Began working on StdLib for libCpScript.Asm (c version)
try 137
Corrected separate_two_balls. d += 50 generates  -tick- every time the funciton is called. This shows that the problem lies in some other place. Heap or detection.
Convert tabs to spaces
Merge in current dotfiles settings

Manual copy & paste of current settings.
Gotta start somewhere
Comment out OSX options I don't prefer
Comment out homebrew installs I don't use
Update README
Enable git autocompletion
Update with settings from work machine

Uses older prompt for now
Shift PS1 into .bash_profile for Git branch auto-completion stuff

Wasn't showing the branch name, will troubleshoot more later
Disable SCM Breeze for the time being

Seems to be interfering w/ the Git status being written to PS1
Revert "Disable SCM Breeze for the time being"

This reverts commit 8f16cbf3a5ac74d574e58d1262ce95c0aceb735a.
Merge branch 'master' of github.com:jeffbyrnes/dotfiles

# By Jeff Byrnes (14) and Mathias Bynens (7)
* 'master' of github.com:jeffbyrnes/dotfiles: (21 commits)
  Convert back to tabs, add EditorConfig
  Slightly better color for location in prompt
  Got the git prompt working
  Use non-git-ified prompt for now
  Revert "Disable SCM Breeze for the time being"
  Disable SCM Breeze for the time being
  Shift PS1 into .bash_profile for Git branch auto-completion stuff
  Update with settings from work machine
  Enable git autocompletion
  Update README
  Comment out homebrew installs I don't use
  Comment out OSX options I don't prefer
  Merge in current dotfiles settings
  Convert tabs to spaces
  .osx: Add more Finder settings for icons on the desktop and in icon views
  .osx: Show icons for hard drives, servers, and removable media on the desktop
  .bash_profile: Source `~/.extra` before the other dotfiles
  .aliases: Make `update` update `npm` and its installed packages as well
  .osx: Add Twitter.app settings
  .osx: Comment out the line that enables the 2D Dock
  ...

Conflicts:
	.bash_profile
	.bash_prompt
	.functions
	.gitconfig
	.osx
	.scmbrc
	.vim/syntax/json.vim
	.vimrc
Updated readme, once again.
v0.005 add plugin
Reorganise dotfiles in seperate folder
ENH: encrypt - win32 port working

- all tests passing (mac 10.6.8, win XP, linux CentOS 5.7)
- better logging
- _shellCall with list: try to catch & escape whitespace (not working)
But:
- win XP: fails to remove tmp directories ("in use by another process")
  so catch & delete files, warn about tmp dir left behind
ENH+DOC: microphone .stop() in Builder component; .rst file

- also bugfix: blank duration is now handled
JSON blows
Merge branch 'master' of github.com:jergorn93/grapevine

Conflicts:
	grapevine/fuzzmod/__init__.pyc
	grapevine/fuzzmod/randomFI.pyc
renamed foobar.rb
Updating dev branch with cleaned up slide out navigation and working jsrender template.
removing main from package.json

the package.json contained the following:
"main": "lib/zq.js",
Merge pull request #1 from machadogj/patch-1

removing main from package.json
Fix to tools.
TTY backend: added check in close function; removed commented code section
Devices: added backend string to allow printing the backend in use
Main: added backend line to init statements
D2xx backend: implemented device enumeration and serial matching
TTY backend: replaced usleep with msleep
D2xx backend: implemented device opening, attribute setting, and RTS
Device backends: changed length values to size_t
D2xx backend: implemented reading
TTY backend: restructured read and write returns a bit
D2xx backend: implemented writing
Client: improved handling of EOF in menu
D2xx backend: added error handling for handle close
D2xx backend: clarified the type of error code in failure messages
D2xx backend: moved open boolean earlier; array now freed earlier
TTY backend: moved open boolean earlier
Device: removed problematic one-byte write function
Client: replaced usage of one-byte write routine with normal one
Libftdi backend: implemented device enumeration and serial matching
* Use dm instead daemon. It's more specify
* Merge device_model_build and daemon_build
add simple preview for layouts - moved to simpler parser for template rendering
Rename run() to wait()
Remove start()

    - The events are prepared on add() instead, which makes the whole
      API simpler.
    - Update documentation related to events and fixed arguments to
      events.
    - Add error event
Adding all the UID stuff again. GIT STOP BEING A BITCH
reaction prefix works

Reactions starting with [ ]: work correctly in loading and Reaction
editor. Still need to address issue if reaction is directly edited and a
compartment is added to a species.
ProgressBar indeterminate at preload

When loading SBML files, it takes some time to start actually loading
into database. The progress bar is now set to indeterminate mode during
this time.
Rescue load errors from the config file and provide a useful message.
Changed the ssh script
template analyzer handles datasets
Added support for captions on each frame
minified
added build failure image me
Added my own tailored common build
svm_train : cross validation dumps confusion matrix and precision + recall per label
Merge branch 'fragmented_responses' of https://github.com/fabiokr/httparty into fabiokr-fragmented_responses
Remove unused parameter and for-loop
Fix use of deprecated methods
Fix use of deprecated methods
pictures added
pictures added
Merge branch 'master' of heroku.com:sugarcat
starting work on subdivision
Added conditional on rewind
Fixed some random lint warnings.
version 1.1.1
v1.1.1 release snapshot
Updated endpoint example.
use LANG_NEUTRAL
inital implementation of service main
polish usage()
introduce constant
make create service use real commandline in registration
resolve paths
New logo by @keepitcomplicated
Added a helper script for creating releases
Release version 12
new limited red gem
Refactor to move session interaction into one file
return latest pod when url has no version.
fixed automation point dragging issue
removing unused args line
Merge pull request #1 from courtneycouch/patch-1

removing unused args line
Added arguments & comments
renamed ConsoleProcess to ConsoleCommand. hopefully a better name.
bugfixes and all cubes placed, finally
ApplicationWindow
- Will only run create contents if account != null, basically if an
account was authenticated.
- Deletes account on logout.
Add some bootstrap classes
Move account option to foundation.
Adds plantri
Adds PlanarGraphGenerator .jars
Output n-quads for normalization.
remove out of date FIXME
merge with read-only patch
only commit a space map if the index has changed
Turned fatal error into warning when removing SCC bindings.

My project history had some invalid XML in a project file way back in
the mists of time. It was blocking the import.
Add Github related aliases
ncurses4j 0.0.1

Signed-off-by: Bob the Builder <releng@valotrading.com>
ncurses4j 0.0.2-SNAPSHOT

Signed-off-by: Bob the Builder <releng@valotrading.com>
Merge pull request #2 from valotrading/releases/0.0.1

Releases/0.0.1
Remove Scala version from artifact names

Signed-off-by: Jussi Virtanen <jussi.virtanen@valotrading.com>
Merge pull request #3 from jvirtanen/fixes/remove-scala-version-from-artifact-names

Remove Scala version from artifact names
ncurses4j 0.0.2

Signed-off-by: Bob the Builder <releng@valotrading.com>
ncurses4j 0.0.3-SNAPSHOT

Signed-off-by: Bob the Builder <releng@valotrading.com>
Merge pull request #4 from valotrading/releases/0.0.2

Releases/0.0.2
removed coffeescript publisher
fixes horizontal scrollbar
remind member password
IRCClient
Tweak size of rating image.
Dodanie ikon statusów
server side stuff

add server mode
add content provider for server db
add server checkin list
Updated gcc options in makefile.
dmesg: fix kmsg read if read returns EPIPE

The /dev/kmsg can return EPIPE if current record has beed modified
while reading.

For init_kmsg, it cause switch to DMESG_METHOD_SYSLOG
(which is not expected) and later it can truncate output.

Signed-off-by: Milan Broz <mbroz@redhat.com>
build-sys: determine availability of __fpending()

Needed to for making Cygwin more possible.

Reference: http://comments.gmane.org/gmane.linux.utilities.util-linux-ng/5656
Reported-by: Bernhard Voelker <bernhard.voelker@siemens-enterprise.com>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
fdisk: remove stack jumping

This patch eliminates the long/setjmp code. The current logic does not do
anything with stack jumps as it only exits from
print_partition_table_from_option() when a fatal error occurs.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
fdisk: remove listing variable

useless global variable.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
fdisk: rework fatal errors

When the device cannot be opened, there's no point calling fatal() when we can
just use err(3). When any other kind of fatal error occurs it's Ok, in addition
we can also go ahead and close the descriptor before exiting the program as
it's currently leaking.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
fdisk: remove dummy function

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
Merge branch '2012wk17' of https://github.com/kerolasa/lelux-utiliteetit

* '2012wk17' of https://github.com/kerolasa/lelux-utiliteetit:
  build-sys: determine availability of __fpending()
fdisk: isolate dos label logic

DOS specific logic is currently embedded in the heart of fdisk code. This patch
separates DOS label specific code into its own file, just like the rest of the
labels, leaving a more generic fdisk.c file. Most changes are just moving code
from fdisk.c to fdisk.h and fdiskdoslabel.[c/h].

The only logical modification is calling dos_delete_partition() from
read_extended(), instead of the generic delete_partition.  This is ok since
read extended is only called from a DOS context.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
cleaned up aloha id handling
Integrated with server-side upload/download functionality.
bugfix for opening a document
selection bugs
enabled viewpanel
Added option to display network activity in HUD
Fixed the examples to work with the latest express version.
Merge pull request #61 from skaslev/master

Fixed the examples to work with the latest express version
Check connection status in firstHandler (fixes #62)
Merge pull request #63 from nicokaiser/master

Check connection status in firstHandler
Remove unused options parameter in Sender classes
Merge pull request #65 from nicokaiser/master

Remove unused options in Sender classes
Fixed 135 rotation, made some methods class methods, and minor refactoring.
Implemented Euler 19.  Haven't checked answer yet.
Implemented Euler 20.  Haven't checked answer yet.
Add Simple RBAC

db:
update users table with new column 'role'

scripts:
add roles array in main config (temporary?)
update Users views to support new column
update login to set role
update controller access control,
       to check for 'admin' role for operations (admin,delete)
update main layout link visibility to check for role instead of userId
Fix empty build.
Adding median of two sorted arrays O(n) solution
skjdfsd
removed colors from dart2js :-(
updated packages
dart2js
GameRoot: removed unneeded mouse tracking

hopefully fixed firefox
Finished move to using JPA.
Remove bad format in error message
Making installing work.
Updated backbone to a compatible version
Forget to add return
build_travis - install template 1.2.6
Merge branch 'master' of github.com:knowhow/F18_knowhow
opcija alt+S ispravljena
license changed, jsNormalize removed
[evcoap] client: rerun without reinit
BeBoPr: make readAIN a sync call

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Avoid crash when dragging video/audio drivers
Fixed permission for /job list.
new gk_cyber_world map
webcommando
Move Value to value.rb.
binutils: actually create multiarch utilities

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
saxon-b

Closes #10634.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
typo

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
groonga 2.0.1

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Enable building of terminator.  Still requires user to do a symlink
to fix an issue:

ln -s usr/local/Cellar/pygobject/2.28.6/bin/pygobject-codegen-2.0 /usr/local/Cellar/pygtk/2.24.0/bin/pygobject-codegen-2.0
Merge branch 'master' of https://github.com/mxcl/homebrew
#59: Bot: do not delay if the page hasn't been saved
It would be too weird to have a different status if the page hasn't been
saved; implemented a way to avoid the selection of pages more than once
in lists (e.g. Special:LinkSearch)
end_use_dayカラムを追加するためのマイグレーションファイルを追加
マイグレーションによるend_use_dateカラムの追加
モデルにend_use_dateを追加
end_use_dayをフォームに追加
dateコントローラーのロジックを指定日時end_use_dayまでのデータを読み出しするように変更
Increased maximum length of last position value.
solved diamond
Update README.md to point to new install script
Test for rate limit check
Also check that the isRateLimitExceeded method returns false
Fix rate limit check method not working if whois result has trailing spaces
Bump requirements.
Send stats after the request comes back from Rails so that we can use controller.action
2012-03-15 13:25:34
Don't use rcov
Changing universe to a ClientSpace receptacle
Initializing client passing server information as parameters
refactor k_mixture_model_to_interpolation.cpp
remove duplicated defines
write pinyin_lookup2.h
begin to write pinyin_lookup2.cpp
fixes compile
add dump methods
write aux functions for pinyin lookup2
begin to write pinyin lookup2
write get_best_match
write search_unigram2 and search_bigram2
fixes get_best_match
write get_best_match
write pinyin_lookup2.*
fixes a typo
use pinyin lookup2
turn off dump functions
remove winner_tree.*
remove pinyin_lookup.*
improves autoconf
improves get_best_match
Mon Mar 26 13:49:23 CDT 2012 testRepo
Correção E-mail
UPDATE conf.py
Version bump.
Update autoconf to 2.68.
Update automake to 1.11.3.
Update libtool to 2.4.2.
Trailing spaces removed
New Stargazer plugin configuration option added: 'allownotinetable'.
Stg headers checking order during configure stage changed so that headers used in next headers checked first.
alert: Add Ringer Control Point characteristic
alert: Add Ringer Setting characteristic
alert: Add Alert Status characteristic
alert: Initial Alert Notification
alert: Add initial support for RegisterAlert D-Bus method
alert: Implement category registration in RegisterAlert()

The alert category is now properly verified and stored (if
supported).
alert: Add initial support for NewAlert D-Bus method
alert: Add initial support for UnreadAlert D-Bus method
alert: Add support for automatic unregister when agent leave D-Bus
alert: Add per adapter attribute handle information

Each adapter may have different GATT services running, therefore any
attribute handles (e.g. for updating characteristic values) need to be
saved per adapter.
alert: Update Supported New/Unread Category characteristic values
alert: Update new alert characteristic value
alert: Update unread alert characteristic value
alert: Implement MuteOnce command
alert: Add support to call MuteOnce()

When BlueZ want call MuteOnce() method from org.bluez.AlertAgent
interface for a registered agent, the function
agent_ringer_mute_once() must be called.
alert: Add support to call SetRinger()

When BlueZ want call SetRinger() method from org.bluez.AlertAgent
interface for a registered agent, the function
agent_ringer_set_ringer() must be called.
alert: Add test script
Changed formating of next episode display to show remaining days till the next ep instead of date alone
Merge branch 'master' of github.com:lloesche/Sick-Beard
Add pyyaml to the requirements file
Merge master to csprocessor-maven and version 0.24.8.
Rename: loga-version-number -> loga-version
Move loga-command-alist to read by letter
loga-interactive-command: Apply loga copy command
Switched over to the new testing interface
Renamed mars-tests to test-mars
removed bochs ebuild (in tree)
Fixed helens json
Agregamos metodo de agregado de productos al modelo
Issue #252: Modificar el keywords meta.
Admin: Exibir entidade
Album quase OK
fancybox
Bosta
Basic implementation of DateTime
Merge pull request #6 from DiegoCoronel/basic_date_time_implementation

Basic implementation of DateTime
exemplo MapReduce
mais exemplos com mapreduce
melhoria no relatorio de campos e tipos
Merge branch 'master' of https://github.com/ramalho/mongo-exem
novos map-reduces
low 7 bits
up and working, styles added
pokus o acl na pobocky
General tidy

Edited several scripts to be easier to read
Add a class for LLDP Organizationally Specific TLV
Don't block attachment points in the same broadcast domain
Merge into master from pull request #124:
Fix test issue related to duplicate devices (https://github.com/floodlight/floodlight/pull/124)
Create controller_switchconfig table
Merge into master from pull request #127:
Create controller_switchconfig table (https://github.com/floodlight/floodlight/pull/127)
Merge into master from pull request #110:
Add a class for LLDP Organizationally Specific TLV (https://github.com/floodlight/floodlight/pull/110)
Add @JsonIgore to length fields for OF statistics replies
Merge into master from pull request #128:
Add @JsonIgore to length fields for OF statistics replies (https://github.com/floodlight/floodlight/pull/128)
Initial changes for topology.
REST API support for getting per-switch HA role info
Additional comments for configurable controller ID
Fixed incorrect merge problem.
Don't treat it as an error of the file pointed to by the HA-related rolepath property doesn't exist
Tweak to code that sends role updates to the switches.

Send role request to switches when controller role changes if we
don't know yet if switch support the role request messages. This handles
the case where the switch connected to the controller before the
controller role had been set/enabled and thus we never sent out the
initial role request probe to the switch during the initial handshake.
Fix to serial failover unit test to work with changes to handling of role changes in controller
Merge into master from pull request #129:
Changes to role request support for HA (https://github.com/floodlight/floodlight/pull/129)
Bug fixes to topolgy changes.
Remove unused class
move Debian packaging to a separate repository
Merge into master from pull request #131:
move Debian packaging to a separate repository (https://github.com/floodlight/floodlight/pull/131)
Merge pull request #1 from malcdi/amyj

2 panes & saving working
Revert "started to get zoom functionality back"

This reverts commit 6dee31dec4c3a6618e57b13a5213124c8c6275bb.
Merge branch 'master' into amyj

Conflicts:
	app/assets/javascripts/CanvasState.js
	app/views/main/app.html.erb
	db/development.sqlite3
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
Fix for operators that exist in linux, but not in windows.

The and and or operators, meaning && and || respectivly do not seem
to exist in windows under MSVC++2010. Macros were added to provide
the same functionality.
Changed executable to lower case, and fixed .qml file missing
Added obj directory for random binary trash
Added a .gitignore
Changes to allow for Q_OS_WIN32 not being defined properly in windows
Merge pull request #488 from malderete/master

Typo error!
Merge remote-tracking branch 'upstream/master'
[0187] Add sample instancelock link

Signed-off-by: Yaki Khadafi <ElSolDolLo@gmail.com>
added uninstall scripts
comments added and unused code deleeted
Merge branch 'develop' of github.com:mapmen/mapofdenmark into develop
Small update to coast
CoastData update
Merged from develop
added background and mv workspace to i3, added latex color for vim
Revert "Only autofocus editor if another element isn't already focused."

This reverts commit b1431bd1d84d85ef1337afce69802d5eb5a443ff.

I pushed it by accident.
Revert "Upating the qr_url for redirecting to etiquetar.com.es/qrs/+id_qr, q no funciona la web"

This reverts commit 39db45f6016d08f30cee0c568a2318080a62ce76.
Loader changes
Added Whitelist and Blacklist attributes to Table component
Added a 'push' alias.
Anonymous mostly working...
some tweaks to posts page and added signup, signout, conditional logout, etc
Changed colorscheme to Solarized http://ethanschoonover.com/solarizedx
#child_form: added piggydb.widget.Fragment.initForPartial
Replacing the http: protocol with git: protocol in the deps files.

We are doing this because on some machines, http: cloning produces
errors.
Diff_tools sp fix

Missed one..
testing cygwin git compatibility
Renaming files with number prefixes. Lots of changes in the slides.
Removed old files.
Changed the theme and the references to the slides to get the new filenames.
Removed _build folder.
Added a .gitignore file to tell git to ignore the _build folder.
Add layout of Monitor project
Use Bundler and Gemfile
expose dateIn as a utility function, and test it
bump version
moving code climate button to it's own line
making a few small changes in the save task
removing git and specs
initial numpy support
Fixed alert so it actually calls show.  This is how it's used in the examples of the README, so I've edited it to correspond.  Perhaps a secondary helper for returning the alert object, in case someone wants to change the alertViewStyle etc?
Merge pull request #21 from GantMan/master

Adjusted Kernel Alert to behave as in examples
fixed???
edited style sheet and tested some new funtions
script for RNA to protein is working
revised rna code
Janyu is different
Changes done to html
Changes made to css
added converted button'
trying to fix merge conflict
style
style
finished project
fixed merge conflict
adding picture
adding a couple pixel cushion
final almost
unicorns!
 added indents to left side of page
Merge branch 'master' of github.com:mattfenwick/Bio2012
added presentation to website
Fixed bug related to having Zoo Fleixble Admin installed
Fixes

added some random fixes
More or less a complete redesign.
Now uses Twitter Bootstrap and Knockout.js in addition to jQuery and jQuery UI.
Not very functional but some things work, this is more of an initial commit since it was long ago now.
Prueba acentos
Exception handling in user configuration phases execution.
Basic support for additional share target for saving a bookmark as read later without going through the ui.
Fix FC on save bookmark to read with no account.
Fix display of unicode characters in about screen webview.
Fix some orientation change inconsistencies.
Remove string keys that do not need to be translated from i18n.
Reorganize layouts and change 7" tablet portrait to use phone style single pane ui.
Fix tablet tag list orientation issue and activity titles.
Add bookmark edit default action.
Fix global tag search.
Fix note searching.
Fix global search suggestions.
Use search suggest url text for urls.
Add intent to launch app settings from data usage screen.
Clean up some imports.
Set version number.
Finished Unpaid Promo IT_169
cluster.js moved from vendor
Working on completeness
Removed unused files
cleaning up
MergeOperation now successfully opens MergeView
bio/abstract width in responsive design
Contempt factor: use DrawValue also in case of stealmates

Spotted by Jörg Oster.

No functional change (when contempt factor is not used).