labofsahil/github-event-dataset-2012 huggingface dataset:
merge
Merge branch 'master' of https://github.com/laxatives/cs184-project
Displacement attempt
Merge branch 'master' of https://github.com/laxatives/cs184-project
add list double click change music and display the song information in the consule
adicionado arquivo package.json, licensa MIT e atualizado README.md para usar npm pra instalação de dependências e start do projeto
Added <leon-scripts/> tag as an alternative to /leon/leon.js
* Added <leon-scripts/> tag
* Fixed bug in resource loading cache
Improved CoffeeScriptResourceProcessor
podzial na strony w logach i statystykach
temp
merge
merge
merge
accueil et creation salle partiel
tapis de foin
changement de durcissement de foin
releasing update to allow bucket prefix specification
Re-added checkbox functionality for layers.
Nicer 'delete all ws items' button.
Disabled layer deletion for now.
tsan: Go language support fixes


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@159856 91177308-0d34-0410-b5e6-96231b3b80d8
Take it back to stock init.cardhu.rc
added Twitter Bootstrap for the view side
Added layout for tutorial page. Trying to make button logic work, but
crashes when doing so. 
Merge branch 'master' of https://github.com/lorano122/FractionTutor
Had to change names to lower case on the pictures. Able to navigate to
fling page. Get an error when loading the page.
Ensure program only exits from main function.
Equalize histrogram when loading images from loadFaceImgArray function.
Merged in Andres changes
Fixing some issues for screens around 800x600, still need to wrap text of result
Hide grading for anonymous items
Better letter nulling support
removed some unused operations
Business requests
RST Fix Headers
Fixing the c->java callback to use shorts correctly
add SOAPAction on content-type in http header for SOAP-version 1.2
Primer commit
Merge branch 'master' of https://github.com/lumpundform/lumpundform
Some fixes to the EditPatient UIs.
Revert e18c9ca2a27da22dcdb58edfa2ec2e816f24379f, as it's been rejected
quote arguments in from the first comparison, just to b sure
Merge branch 'master' of github.com:m4risU/francescoteam_pl into master_fixes
Merge branch 'master' of github.com:m4risU/francescoteam_pl into master_fixes
header menu fix
blog styling
Merge remote-tracking branch 'remotes/origin/master_fixes'
Debug message for each bundle.
added stack traces to error reports from workers
cmake scripts for leveldb and nessdb added
simple mongo interfaces works with mongo cmd line client
Merge branch 'master' into mongo_frontend

Conflicts:
	src/bson/json.cpp
	src/dbengine/engine.cpp
merged with master
filesystem namespace changed to bfs
Merge branch 'master' of https://github.com/maciekgajewski/falcondb into index-prototype
compilation fixes
jar-archetypen mukainen projektirakenne
added a grunt file. Moved the app logic into the lib dir
Fixing "When user submit answer more than limited in FR, system gives wrong tip" #1588
Akshay : Showing the entity type on register an entity page when u go from all subjects
ISPN-2262 Wait for the request's topology to be installed in state provider

A node can receive a message from a joiner before it has installed a JGroups
view that contains the joiner. If it tries to send a response immediately,
it will fail with a SuspectException. And since we don't retry sending state,
the joiner will never finish the state transfer.
ISPN-2262 Fix StateTransferLockImpl.waitForTopology

Only wait while the current topology id and the expected topology id are
different.

Also move the while loop inside the synchronized block, otherwise we might
miss notifications.
fixed broken log.tracef statements
ISPN-2256 Cache creation is serialized
ISPN-2288 Do not register the RecoveryManager MBean if recovery is not enabled
ISPN-1405 Make it possible to disable a CacheStore via JMX
ISPN-2290 MBeans should be registered even if JMX statistics gathering is disabled
ISPN-2304 Disable tests in a way that it does not impact the testsuite
Set the initial topologyID to -1

This causes a topology update on initial connection, potentially cleaning out invalid servers in the server list.
Cleaning up

Adding ticker example (needs dependancies).
Cleaning up index.html tabbing.
Performance Build DB from git commit 07740d10fbcd79174fb5e30b67e62c79497b3227 using node bob
Performance Build DB from git commit 82defa567e6f312abb20c74fa786944b3f4f94c6 using node bob
Performance Build DB from git commit 25c7e3bdb5017ebcb386a4b8ccfd1a798d7fd47b using node bob
Performance Build DB from git commit 7d002e09b975e48b2236e56c7050a2504787c98a using node bob
Performance Build DB from git commit f0d7022bd48c716b29a87ebd05cbd23f9cca796f using node bob
Performance Build DB from git commit 45634ab271c508ca37cd33b5689f89ac6e4fc9dd using node bob
Performance Build DB from git commit c0f3d13d11d7589f0e198896ece947fcc3516b62 using node bob
Usando ActiveRecordException en el DbPool...

Ademas ver si se puede verificar que esté cargada la extension
especifica.
Si existe la instancia del $this->resultSet se retorna SqlException...

En el metodo query del Model, sino lanza un ActiveRecordException
Room Controller (object) + Room1 (view) completed
Updated SgmlReader.
METEORO agregando status a la respuesta de forecast
METEORO agregando fecha posta
adding 2 APIs for updating customer's phone number
Merge pull request #14 from marinho/jin-changes

adding 2 APIs for updating customer's phone number
Updated firephp submodule to tag 0.3.6rc6
Restrict rollout query to constant time
viewport support from css3
Making ID generation securely random
Removing fixes for other bug
Removing more fixes for other bug
Adding node 0.4 backward compat for id gen
Merge pull request #857 from martinthomson/bug/856

Fix for ID generation vulnerability #856
I continued to have websocket connection issues in Safari when using SSL that terminated at a load balancer. The shorthand logic that was here was nice and compact but didn't seem to work. Took the "intent" of the short hand and made it a bit more verbose and now it works.
Merge pull request #868 from bodash/patch-1

I continued to have websocket connection issues in Safari when using SSL...
Update copy
Merge pull request #869 from MrSwitch/master

Small change to demo copy
Merge branch 'master' of git://github.com/LearnBoost/socket.io into bug/854
rain.html
addet UUID category to NSObject
User model with passwords, and user show page
User model with passwords, and user show page
Pluralized UserController to UsersController and all the related file renames
Add survey link to the 243/Final.

Partially fixes Github issue #15.
Add survey link to the 242 final.

Partially fixes Github issue #15.
Added an exception question
Added 2 questions. One about comparison and one about classes vs objects
Readme: Document new graphviz dependency.
Merge branch 'master' of github.com:caltry/CSC-reviews
Solved Issue #13: No answer for trace of Quicksort and Mergesort

Added an answer for question 15 in the 242 Final Review
The answer consits of two graphs, one for Mergesort and one for Quicksort
Also included a new tikz library for shapes. This was necessary for the ellipses in the graphs
Merge branch 'master' of https://github.com/caltry/CSC-reviews
Added a question about design patterns to the 243 Final review.

Added the question which asks which design pattern is used in a snippet of code.
The correct answer is the Factory design pattern.
Added a question which touches on interfaces, abstract classes and a little on collections
Merge branch 'master' of github.com:caltry/CSC-reviews

Conflicts:
	243/Final/CSC-243-Final-Review-2011-3.tex
Added a collections problem
Added a question regarding Layout Managers to the 243 Final review
Merge branch 'master' of https://github.com/caltry/CSC-reviews

Conflicts:
	243/Final/CSC-243-Final-Review-2011-3.tex
Revitalized Nick's Heavy Threads question.
Clarified wording of question 5 slightly.
Added csc package & logos to 242/243 reviews
fix implicit declaration and pointer without cast
Merge pull request #3 from ketheriel/master

fix implicit declaration and pointer without cast
Tests now pass correctly
Socket.close() was missing
Use mockjax in example
Use jsuri to parse urls in example
added my solutions to the first hacknight that I have solutions for
Cleaned up samples a bit.
50% colon.  50% comma.  100% redundant as a line ending.
Solving the submodule issue
getScreenshot is now in Session, not Driver
PKGBUILD: add wget dependency

wget is not part of base-devel or core and needs therefore to be added

Signed-off-by: Matthias Maennich <matthias@maennich.net>
set version to 0.4.4

Signed-off-by: Matthias Maennich <matthias@maennich.net>
house keeping
Adding skeletal Event header
Cleanup: Moved feature types into seperate header.
Formatting this header
Adding utility header. Added mixin_cast (does not work)
- Moving Mixins out of the main plugin header.
- Extras header added for features that are not part of the
  Official LV2 Specification.
Segmenting <lv2mm/types.hpp>. Moved feature types into own file.
- Adding complete fundamentals hook-ups for the Data Access Feature
- Adding Event related mixins to event.hpp
- Code Style and Cleanup
step-5 transclusion
step-6 transclusion (solution)
Java file read demonstration, to help people getting started.
add descriptions to some more namespaces
Merge pull request #1 from ansell/master

add descriptions to some more namespaces
syphon now uses video's textureReference and apps are recorded into an FBO

this way things are a bit more neat, wouldn't want the left and right
apps to send out syphon just by grabbing a screen, mainly because those
apps only need to show stuff through syphon. Might save some memory :-)
Streams for traversing. SubDirType for traversing subdirectories.
Removed values-v14 so HoloEverywhere also overrides the original ICS Style for devices with custom themes like MIUI
big commit
Merge branch 'monopoly-game' of
ssh://git@github.com/milky-way-crew/WildWest.git into monopoly-game

Conflicts:
	src/main/webapp/resources/js/monopoly/monopoly.js
big map
Merge branch 'monopoly-game' of ssh://git@github.com/milky-way-crew/WildWest.git into monopoly-game
add title text link
style title text
Removing sort function that is not being used.
Added some info about dsymutil
Remoção de traduções desnecessárias
adding fourth function
moved everything into pubsub namespace
Added wrappers for artist.get and artist.related.get.
Add DateMatchers static factory
改善 PHP4用のmemory_get_peak_usageの記述を整理
コード整理
Added goal MONITOR-ACTION and use it in plans.
Merge branch 'master' into asynchronous-process-modules
Revert "Removed call to monitor until we merge in the corresponding branch."

This reverts commit 52986666b324e760c4369680e5dc5f28acbc04ab.
Merge branch 'master' into asynchronous-process-modules
the context is checked and it is modified if it is needed(there in the server.xml (in "host" element) the attribute "copyXML" has to be set on "true"). request for adding should be working now.
Added DJs to schedule
Revert "App::Comments::_extend_commenter_session: removing support for days/seconds session extension, bugid:107749"

This reverts commit 0ddb3e18eba620a75faf33a9e803d2d9a0db1780.
where ever cms_post_save is called, cms_pre_save should be called too, bugid:108480
Fix date display for History tab.

Switch History tab datetime display to the same format as in the overview tab.
added the "globaloptions" command - see #96
b=809123; disable broken browser_586068-reload.js test; r=ttaubert
Bug 764699 - Fix setting mCheckNetwork in search suggestions test. r=kats
Bug 764928 - Support short in dictionaries. r=khuey
Bug 764604 - Device Storage - crash when using from gaia chrome.  Do not dereference null uris. r=bent

--HG--
extra : rebase_source : 54889b39ce65373878de9865ab0603b890fa23ec
Bug 773886: Prevent loading resources from app:// URIs from outside that app. r=sicking
bug 768029 - Apply CSP Policy to trusted and certified apps. r=sicking. Parts by sicking, r=mounir.
Bug 793132 - Make sure that only display lists get the reference frame adjusted transform. r=roc
Bug 813172 - Evaluating 'arguments' as a watch expression always yields an empty pseudo-array, r=rcampbell
Bug 805759 - Relax global search results auto-expand rules, r=past
Bug 813587 - When performing global searches with very few characters the browser may become unresponsive, r=past
Bug 813697 - TypeError: breakpointClient is null at debugger-controller.js:472, r=past
Bug 820216 - should use JS_NewUCStringCopyN to copy a Unicode string, r=gyeh
Bug 771655 - Debugger does not show up if any progress listener (e.g. NoScript) reads the WebProgress argument's DOMWindow property in onStateChange(); r=vporof
Bug 802081 - listTabs returns empty tab titles after startup; r=rcampbell
Bug 804437 - Don't copy user.js section when it's hidden. r=Unfocused
Bug 720311 - Don't open formhistory.sqlite on shutdown in order to close it. r=mak
Backed out changeset f33e99e56d52 because of xpcshell failures
Bug 806821 - GCLI should ensure that 'string' command return types are treated as plaintext; r=jwalker
* * *
Bug 800363 - XSS in Web Developer Toolbar's chrome privilege page
Bug 798458 - changes to make minification of GCLI work; r=dcamp
Bug 800346 - Autocompletion hint text is not visible in the latest Nightly; r=dcamp
Bug 801387 - GCLI rollup bug fix for bugs 795324, 797016, 791085; r=dcamp
Bug 783729 - Debugger: JS scripts can get HTML syntax highlighting, r=rcampbell
Bug 806748 - Intermittent browser_dbg_location-changes-blank.js | The source editor not have any text displayed. - Got 546, expected 0, r=rcampbell
Bug 740551 - ThreadActor should automatically add appropriate debuggee globals - Patch v14; r=rcampbell
Bug 774011 - Intermittent browser_dbg_createRemote.js | Should be paused after an interrupt request. - Got false, expected true | Should have one frame in the stack. - Got 0, expected 1, r=past
Implement Debugger.removeAllDebuggees for efficient debugger shutdown (bug 740551); r=jimb,jorendorff
Merge fx-team to m-c.
Bug 819525: JS GDB pretty-printers: Don't trip over tagless structs. DONTBUILD r=sfink
bug 820691: Don't use GDB's --python option to run JS pretty-printer tests; newer GDBs don't have that option. DONTBUILD r=sfink
Bug 767215 - Re-enable robocop testLoad, testPanCorrectness, testFlingCorrectness, testOverscroll, testAxisLocking; DONTBUILD
Bug 805063 - Fix hang in crashtest for bug 791330. r=ekr
Bug 820179 - Mach command for packaging. r=gps
Fix bustage of b2g desktop builds, no bug r=me
Bug 806432 - When creating the offscreen surface into which group opacity, mask or non-trivial-clipPath are painted, use the non-transformed visual overflow rect. r=roc.
Bug 779048 part 0.5.  Don't require a JSContext argument for nsJSUtils::GetStaticScriptGlobal.  r=bholley
Bug 779048 part 1.  Implement a parent class for C++ reflections of callback functions in WebIDL.  r=bholley,smaug
Bug 779048 part 2.  Rearrange how we do our includes and forward-declares to actually work with callbacks and dictionaries sanely.  r=peterv
Bug 779048 part 3.  Refactor the code we use for generating example declarations a bit so we can reuse it for callbacks.  r=peterv
Bug 779048 part 4.  Implement basic codegen for callbacks, without handling of arguments or return values yet.  r=peterv
Bug 779048 part 5.  Make js-to-native conversion support doing something other than "return false" on JS exceptions.  r=peterv
Bug 779048 part 6.  Handling of return values for callbacks.  r=peterv
Bug 779048 part 7.  Make native-to-JS conversion support doing something other than "return false" on JS exceptions.  r=peterv
Bug 779048 part 8.  Handling of arguments for callbacks.  r=peterv

Note that we're now using the array object as the "obj" when wrapping
sequence members, because we don't have an 'obj' around in our
code... and every single existing sequence-of-interfaces consumer
relied on there being an 'obj' floating about.

Also note that I needed to rearrange the various wrapping helpers so
that we can wrap things that are hanging out in const smartpointers or
in const OwningNonNull or in plain object references.
Bug 779048 part 9.  Give JS-to-native conversion an object pointer to work with so it can convert callback objects.  r=peterv
Bug 779048 part 10.  Start using the new callback codegen in argument and return value conversion.  r=peterv,smaug
Bug 747257 - Part 1: Load .mp4 files in a document wrapper. r=rillian
When compiled with --enable-gstreamer, use a document loader for video/mp4,
and associate that type with the decoder in nsHTMLMediaElement.

Bug 422540 fix lets gstreamer render h.264 videos from within webpages with
<video>, however to view these files when loaded directly we need to recognize
their Content-Type.
Bug 747257 - Part 2: Add media type mapping for .mp4. r=rillian
Associate .mp4 files with the "video/mp4" mime type so that we can open them
directly via file://
Merge the last PGO-green inbound changeset to m-c.
Automated blocklist update from host linux-ix-slave25
Merge last green changeset from inbound to mozilla-central
Merge last PGO-green inbound changeset to m-c.
Merge the last PGO-green inbound changeset to m-c.
Bug 750109, outerhtml crash, r=hsivonen,sicking
Bug 756851 - add missing call to object->markIfUnmarked before GCMarker::pushObject. r=billm
Merge m-c to inbound.
Bug 746115 - Don't use getPrettyVersion for partner-repacks. r=coop
post merge cleaning, use one gemspec
closes #23 - implement upload_folders directive in hosting_config
Re-made title page in LaTeX
Remade title section
Updated title and copyright sections
Updated HealBot Continued to 5.0.4.4
add perf counter publication in roles. add settings to control diagnostics
Merge pull request #357 from fsimonazzi/354-azure-diagnostics

add perf counter publication in roles. add settings to control diagnostics
added the update status language.
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/strings.xml
Updated 64 bit BASSMIDI
Now writes the 32 bit uninstaller to the correct location
First regexp try for felix
first regexp parser for felix
Merge branch 'master' of https://github.com/muttigit/attentionwhore
UP: add track like previous one
Merge branch 'master' of github.com:muxisar/VerbierFestival
Update mock to 1.0.1 (1.0b1 does not exist anymore)
Configured batches and database generation per batch
restarted WordFrequencyReduceTask
merge issues WordFrequencyReduceTask
Ya betol
Automatically add hsot key signatures for newly encountered hosts during ssh/git cmds.
aanpassingen aan trace formaat
adding another profile
Image Resize and Log
added base64 encoding for images

You can include the images inline with base64 encoding using a new
filter imgbase64. If you have PIL installed, you can resize, too.
skip optimize when saving image to string

this sometimes causes a bug in PIL.
Fancy fail if no setuptools
Allow spaces after commas in tag list
Minor reorganizing
Create tests and test data
Tox testing
add_photo -> set_photo
Initial commit of docs
Work on documentation
Add contributing instructions
Improve module docstrings
Move bulk of README to docs
Finish up documentation
Adjust configuration of docs
Bump version
Made changes to the character layout and the battle controller
images can now be imported/linked
improvement completed
mod top and stat/your_records
Merge branch 'master' of github.com:neko-punchi/neko-punchi
adjusting Neoclipse link. closes #50, thanks @jotomo!
move output up, minor gui fixes, simplify code
Ajout d'une redirection sur la page d'inscription quand on est connecté.
Mr.Trololo
fixing support count text
Merge pull request #5 from niallo/master

Add Twitter Bootstrap JS to lib
API refactor
- apres.delegate() uses jquery.on and has simplified semantics, events are now
  always derived from the delegate's events property.
- add apres.undelegate() to faciliate removal of widgets and controllers.
- apres.widget() can now remove widgets, add widgets by module name, and it
  returns widgets via callback
- controller can now be get/set via apres.controller()
- refactor markdown widget to use new api
Merge branch 'master' of github.com:apres/apres.github.com
Fix viewsource view and move to demo dir
rename src param types to camelCase and add tests
Add apres.srcPromise() api for loading resources conveniently
Better error reporting

fix illegal invocation errors caused by rebinding of console.error
Rethrow loading exceptions when there it no callback
log loading errors when there is a callback
Fix sourcelinks on pages with no controller
Enable views with no controller
Add base, zurb grid, and simple theme stylesheets
implement include widget and formative demo view
spruce up the include demo a bit
Add handlebars template widget with demo
Create gh-pages branch via GitHub
Add malcolm.net.nz to CNAME
Get rid of github cruft
Merge branch 'master' of github.com:nickmalcolm/nickmalcolm
Don't need a readme
Cleaned up requires for config API
Balls can now move.
Removed a timestamp from html files
first commit yeah !
Cleaning up Admin Role spec
Fixing Admin specs
Fixing Admin specs
Fixing Agent roles model & specs
Adding Analyst models
Passing all model tests!
Imporved the readme
Switch to de_DE

nl_NL doesn't seem to exist on the ci server.
Moving the class inside the package correct
friendlier messages
BridJ: removed most CharBuffer-related methods in Pointer, because wchar_t does not match jchar on MacOS X (consequence of issue #295)
updated README to reflect new output
make xml parser tolerant for whitespace at the end of the doc
[fix] добавил название при сохранении продукта
fix botched search/replace
another case that needed protection
Add basic build-ogpl.make, drupal-org.make.

There's still a little work to be done here to make sure
all libraries download and directories get organized as seen in
the repo. Once this is done, contrib projects in modules/contrib
and third party libraries can be removed.
Add ogpl.rebuild.sh. This script builds the code base, pulling in external open source projects.

To build a full code base (including Drupal core) run:
drush make build-ogpl.build
Don't debug WIP tests.
Remove core block link and delete widget from contextual. Add remove widget.
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into master7
If widget defines no tags, give it Misc
simpleview themes more link correctly.  hides empty blocks.
Merge branch 'master' of github.com:openscholar/openscholar
Hide harvard API importer node from content types list.
Merge pull request #1034 from openscholar/1033

Hide harvard API importer node from content types list.
Term migration should bail after erring #725

Forgot to return after saving warning previously.  No point in trying to work with a $term object that doesn't exist.
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Fix theme declaration
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into master7
Improve openscholar_install_finished
#532 delta was updated but not block ID for recent docs, this caused duplicate active blocks
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Multistep configuration form + Install types + Install flavors
Gave slideshow some display options
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
getting specs up to 1.9 sclized

sclizing gems

also fix up remote user

removing rcov and updating specs for ruby193

updating Rails version

bugs

Removing thread-dump

getting openshift-cgroups to the right place

add init file to files section

ruby 19 changes
Ruby 1.9 compatibility fixes

- Reference the new postgres gem
- Add more debugging context to unix_user_observer
Moving plugins to Rails 3.2.8 engine
add config to gemspec

Fixing gem specs

add temp scl enable ref

add debugging
Remove hard-coded ruby references

Replace hard-coded /usr/bin/ruby refs with /usr/bin/env to ensure
the right Ruby is used contextually.
getting tests working
WIP Ruby 1.9 runtime fixes
fixing tests

fix test cases

fixing tests
Test support and nodejs test fixes for Ruby 1.9
Move trap-user.feature and trap-user-extended.feature to origin-server
Use the standard util for PATH construction
get the broker working again

merge issues

change to 193 gems for rhel
fix testdescriptor generator

fix tests

fixing tests
Use standard PATH util in jboss carts

This corrects the Ruby context used during builds.
WIP fixes for haproxy Ruby 1.9 usage for scalable apps
Restore original PATH logic
Source rewritten PATH before further mods
Don't pass a shell script to Daemons

Daemonize the Ruby script itself rather than the shell shim, as the latter
is unsupported by the library and the invoking script is already in the
correct Ruby context.
remove mocha version
use version 0.12.0
Corrected info about the names of the OpenTok framework and required files.
Merge branch 'master' of https://github.com/opentok/opentok-ios-sdk
Changed view-raw into view-parsed setting (on by default)
some test enhancements
added the iOS images.
added the iOS images.
Admin Sites Controller.
finishing up with cl-async conditions, app thrown conditions on the way...
adding connect-cb keyword argument to tcp-server
adding docs for tcp-servers :connect-cb
readme fixes
pointing README to new doc site
fixing readme doc subnav
and another readme fix
readme tweak
Merge branch 'master' into future
updated changelog
updated translation strings
Version 1.3

Incluye menu personalizado para cada perfil que se crea
Lagt til fancy-bok (inspirasjon fra bekk.no) for modal-boks visning av score
Merged remote server, added compact protocol, updated examples

Signed-off-by: Ozan Turgut <ozanturgut@gmail.com>
adding local changes for merge
option method now runs for each box
Change to use "Medium" style, and fix weights
add bacterial movement
adding in links to documentation
Initial code base commit to sync to November 13.
weird error
weird error 2
Automatic downloader added
Add fallbacks_enabled option
Merge pull request #32 from bobbus/master

Add option fallbacks_enabled
Updated main.tex with Phase 1 content.
Merging almost complete
removed printHelp() method and rolled its contents into catch block of main method since printHelp was only being called from there
Merge branch 'master' of github.com:patrickoneill46/nodepad
Merge branch 'v2' of github.com:patrickoneill46/nodepad into v2
Changed 'Sources' to 'Sources consulted' in paulsdice.js
adding a dir for final project
don't render shadow on dying enemies.
lines for bullets
generating kaminari views with rails g kaminari:views default
Incrementing position automatically for newly created faqs
Added Samba to build scripts.
setting up stage-block data structure
Updates for Issues module linked to #91
Wave of documentation.

Adds phpDoc comments for global/public elements.
No code changes.

See issue #274

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4314 2fea6a4d-a838-0410-917b-93a53c48e9d2
Make properties documentable, PHP5-style visibility.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4315 2fea6a4d-a838-0410-917b-93a53c48e9d2
PHP5 style constructor, tell methods visibility.

Drops reliance of PHP4 compatibility layer from theme class.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4316 2fea6a4d-a838-0410-917b-93a53c48e9d2
Document theme properties.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4317 2fea6a4d-a838-0410-917b-93a53c48e9d2
Programming style and consistency.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4318 2fea6a4d-a838-0410-917b-93a53c48e9d2
Wave of documentation.

Adds phpDoc comments for global/public elements.
No code changes.

See issue #274

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4319 2fea6a4d-a838-0410-917b-93a53c48e9d2
Wave of documentation.

Adds phpDoc comments for global/public elements.
No code changes.

See issue #274

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4320 2fea6a4d-a838-0410-917b-93a53c48e9d2
Finished fixing Software Portfolio
fixed semaphores init when allocated && fixed cpu_time && MP support
testing...
Added sources.

Signed-off-by: Alexander Nassian <nassian@bitshift-dynamics.com>
ssi enabled
Update data/lang/Spanish.txt

PRESSURE IN ATMOSPHERES lines added
Merge remote branch 'Gudadantza/patch-21' (Spanish language)
Removed PRESSURE_N_BAR language token
Merge branch 'language_stuff'
Updated Readme file properly
trying raw vid
stripping off wells
Fix polygon winding order
Fix alpha in non-premultiplied mode
Allow disabling of mipmaps for fonts
Change default render order of sprites and primitives
Clean up gwen rendering
Bounds checking for font renderer
Add trivial support for loading a single sprite from disk
Removed the ZF2 text
Added obsidian ingot crafting item.
Stuff Anthony had
Made Parallel::UserAgent work again.

Signed-off-by: Philip Blatter <phil@pnu.me>
テスト用

実行すると
竹村研b4のスマートブラザーズです
と表示されます
Download dev_bundle into meteors in ~/.meteorite
Simplified calls to spawn by using cwd argument.
Some output for the dev bundle install.
Attempting to merge global.css and style.css
Merge branch 'master' of github.com:pouwerkerk/TEDxUChicago
Add envsetup.sh script and .vimrc settings
1.No default index & type.
2.Allowed operations over whole index or type.
3.Support for url params (full support for routing & search_type).
Client::setIndex() now also set type (clear if nothing was given).
Docs.
added OOP I lecture, breakout, and code
Ajout du rôle dans la normalisation json
erreur de commit
Revert "erreur de commit"

This reverts commit fc4922cdc1369130150fc88e33d150940594a54d.
ajout du rôle dans la normalisation json d'un User, ajout info email si requete d'admin, ajout infos d'user
Remove setting that isn't available on Ubuntu 10.04, and crashes program.
Merge branch 'master' of github.com:programmin1/tunesviewer
Fist Commit Alex Porto
Cambios en panel empresa
Modificados obtenerDatosGastos(), obtenerDatosIngresos(), obtenerBalance()
Eliminado el campo tipo en Movimiento
Modificado ControladorContabilidad para realizar la actualización de las tablas de ingresos y gastos.
socio acabado
Merge branch 'master' of https://github.com/psylock/Diaketas-Manage.git
added google maps and key
Fixed namespace completion when there are no classes defined
in the namespace being completed.
New config option to remove the package when displaying completions.
Fixed fold saving autocomand interfering with TagBar
Clarify audio decode error message
Make compatible with browsers that don't support Web Audio (shader only)
dns record view
ajuste no Savefile dos models e added postDelete
Multiple layers grouped in Network Object
changed args for paxos layer
Add instructions to add the flash to the application layout (for the redirecting to the topics list after creating a new topic page)
Merge pull request #51 from kriztoph/master

Add instructions to add flash code to application layout view file.
Cleaned up and validated files
commented patch and git kernel
changed version to encryption-proxy
changed menuconfig
added clean_kernel script
added gitignore
changed gitignore
changed gitignore
Backtrace fixes based on pull request #4 (thanks, @yinonbentor):

- fixed position of "top level" frame in the backtrace
- reverse backtrace so it's in the order Ratchet expects it
- new config variable: shift_function. When true (the default), function names are shifted down one level in the trace so that they reflect the context of the call, as Ratchet expects and most other langauges do.
- fix notice when $frame['line'] or $frame['file'] is missing.

Also bumping version number to 0.3.1.
lieutenant spelled with a U
automatic parse function will try options.className and underscored versions as well
add README
add source file.
backButton fix
Folder bug fix
Documentation update
Changed function parseUrlEncodedForm  to accept form/query strings that contain no equal sign or an incomplete key value pair instead of throwing an exception. Keys not terminated with an equal sign will be parsed with an empty value string.
Simplified logic for all_other_projects
MarkerParseErrorReporter is set up to pass on the resource that is the
context of parsing. Used for the Xtext parser to attach diagnostics to
the resource instead of using the old marker mechanism.
added extension point for Linking Service. This allows Xtext based annex
implementations to be resolved one reference at a time.
The method is called via the ILinker interface from Xtext.
Set up the AadlParserAgent to call on this interface if the annex
provides the extension for this extension point.
This mechanism is used by the Error Model V2 implementation.
multiple views + activities filter fixes
Split get_diff_files into get_diff_files and populate_diff_chunks.

get_diff_files was set up to run in two possible modes. In one mode, it
just fetched all the files and metadata that would be displayed in a
diff viewer. In the other mode, it would do that and load diff chunks.

Really, there was no reason to do both. It just made things more
complicated. The information loading mode was nothing but database hits,
so we had a certain known level of complexity there. The chunk loading
code, however, was very expensive, and drastically changed what you
would expect time-wise from the function.

Now the chunk loading is done in populate_diff_chunks, which just
iterates through the list of files provided by get_diff_files and loads
the chunks for each.

This is the first step in a series of changes I'm planning to make to
restructure bits of the diff handling code to make it more extensible.
Created EntityCriteriaBuilder && Finally removed Search framework :)
tests/events: add tests for parsing zip files
Merge pull request #3 from rickbenavidez/master

Fixes
Fix issue where meta-click on li in multi-select ListView picks the wrong target element.
Merge pull request #4 from nmeans/master

Resolve multi-select ListView meta-click issue
Add a note about running tests using chrome and issues with cross-origin policy under the file:// protocol
Add sqlite to test group in gemfile so we can dive right into db:create && test.
Fixes #1: make sure that options get applied to the local instance on initialization (just like in the constructor).  Handy when we're setting options to a subclass that are properties of the parent
Fixes Test. Go ahead and bind load/error in the setter.  Move imageAddress update as an option on the instance (since options are fixed).
enable properties and underscore tests
fixes hard links
Added email image.
added png email image too.
Added social media icons.
Add and implement sfBlogComment::isAnonymous(), loadAuthorData(), getAuthorName, and GetAuthorEmail()
removed dependency to doctrine/common
Updated version to 0.10.1.
Forgot to add tooltips js file (issue #11)
create post confirm dialog also shows post placeholder test
base insertion of user stream panel
instagram username visualization for user stream photos panel
2 panels (user stream and tag stream) working
read me updated
added todo file
add last k
Added check_depends and check_network_state functions.
determine_location working correctly.
Removed hashref2array function, placed in general_tools.pl
Added hashref2array function, removed from parse_config.pl
Implemented find_commands function. Doesn't build the commands yet, though.
Implemented run_commands function. Might need to be moved.
Script now accepts target_host as passed argument.
Generated debian files for lucid
replacing the rules file
new rules files
fixing install prefix in rules file
Fix bug where leading blanks were stripped from quoted lines (#1488795)
Arreglo 2  if
Arreglo el parametro de listar amigos, ahora un string
Arreglo el parametro de listar amigos, ahora un string
Metodo para verificar si un contacto ya pertenece a un grupo.
removing thread utilization code
Album edit method created, dialog box for album creation when uploading media files
week4 Playfair -- fixed error in format_message where it was not reseting to start with X on next identical pair
week4 Playfair -- uncommented unit tests and also copied them to specs, all passing now after fix in commit dd92ab3
week4 Playfair -- some general clean up of comments and small tweak to cipher_message()
week4 ch1 -- added elco's code for for chase_cat() LOL
Added the dup method.
Added ubuntu dependencies.
Add Choose button to custom binary path in preferences
Fjerna deps
Removed warning about overnight syncs for password resets
before deleteing the example
hack ideas
interprocess::file_lock::operator=() style fix.
process::context refactoring.
removed logging message that was there for debugging
get logic right for showing/not showing 2 close alerts
Version bump to 0.1.0
New Version
Clean up duration type, define a simple enum
Background image adjustments for the "Back to Project Details" button in the challenge.
[maven-release-plugin] prepare release hw1-guanyuw-0.0.1
Fix NPE
Update to scrutmydocs.org
Split targets.
Add BASH configuration files.
Updates

Finished major parts including post, activity, and detail views.
new file
Added ship class
Added new classes, moved to new folder
Planet, Asteroid & Entity classes and moved to GameObjects
Initial renderer code done
Changed namespace on gameobjects
added addthis to the cartbuttons section of a product type

Signed-off-by: Austin Papp <austin@seven3two.com>
+ layout changed for content
+ adjusted product
+ adjusted front page
fixed h1,h2 to be darker
moving around regions
untracking items.
added roulette region
added roulette region output. 
added new css
adjusted front for roulette tees
adding new front page css layout
Merge branch 'front'
adding page-facebook.tpl.php
nothing changed
added blog fb
added page-facebook.tpl.php
added new blog-fb region for facebook page.
sync
added file
merged landing page for facebook into master. untracking
untracking file
Signed-off-by: Stefan Severin <stefan.severin@hotmail.com>
initial commit
Added ListFeed and ListEntry objects
Added a has_matching_tag method, and dropped the has_css_link method.
Changed to use the has_matching_tag method.
Added a method to HoverButton
"EDIT PROFILE" page - the "country" has an open text field instead
periodic checkin
periodic checkin
every thing works !!
final commit
Implement CountriesController#show
LPS-27271 Images should always have protocol of request
LPS-27271 Add null check- control panel regression
LPS-27271 Source formatting
LPS-26634
LPS-27756 remove UserLocalService calls from UserAtomCollectionAdapter by adding UserService delegates
LPS-27756 added company permission checking to added UserService delegates
LPS-27756 add new service method (updateStatus) and rebuild Journal services
LPS-27756 removed local service calls from JournalArticleAtomCollectionProvider
LPS-27756 Changing company admin check to include omniadmin.users + fixing GroupPermissionUtil, should be UserGroupPermissionUtil
LPS-27756 Source formatting
LPS-27756 Don't pass "long userId" into a remote service since that can be spoofed. Instead, call getUserId()
LPS-27756 Regenerate
LPS-27033 Change delete to move to trash in Document Library Display Portlet
LPS-27033 Change Restore permissions from UPDATE to DELETE
LPS-27033 Support moving individual entries from folder in Trash
LPS-27033 Autogenerated
LPS-27033 source formating
LPS-27033 add test for the move functionality
LPS-27033 Match edit_file_entry.jsp
LPS-27033  Match com.liferay.portlet.blogs.action.EditEntryAction
Update project file
custompalettes: Start to implement more functionality
client: more minification opportunities
Updated menu
Merged bio and cv
Removed log statement
Initial commit
Merge github.com:sideral/latestfm-myband
Fix the python3 errors on Travis.
add project /layout

add project /layout
added uppCustomerDetails parameter as hidden field
client and client/broker are more DRY; log is a little more consistent
provides basic proxy support through the broker

broker will not use SSL

broker can proxy to SSL or non-SSL servers

brokers bind address can be controlled through environment variables

test services all bind to 0.0.0.0
Refactoring test codes.
First shot at adding opus to configure.
แก้ไข meta file
Use the new composer autoloader
Login debug messages and documentation revised
Fixed|Heretic: Warping to a map outside the default progression
ignore Db.php
Fixes known bugs in ABS
Press css tweaks
apple-touch-icon -> apple-touch-icon-precomposed
added notifications and routed gotohomepage
Merge pull request #27 from spencerapplegate/sa/add-notification

added notifications and routed gotohomepage
It would help if the .fcgi was included.
Only test with Ruby 1.9.3
updated pygeo dict key retrieval
Shikhar - Adding gitignore to ignore .idea folder.
working on merge function
using git to distribute code; removed unused functions in master-functions
Added hung process detection
In tests, the 403 response will be signalled by the *forbidden* string instead by *not_authorized*
TST: emplike anova convert test results to array not matrix
Working on first-time startup lift selection.
Made A-Z sorting sub-sort by date descending.
Removing Cube project from the projects page, for now
Changed button text for Web Arcade to 'Find Projects'
Writing to classic working
Store encap::die child offsets in a std::set to avoid linear search.
encap: replace m_parent with p_parent in encap::die. Avoid linear search in get_next_sibling_offset.
Fix stupid copy bug in get_next_sibling_offset.
cxx_dependency_order.cpp: various cleanups, including proper edge-breaking in a corner case.
Add prototype of popup to create promotion from place
news todo
Updated IEDriver, fix for IE ZoomLevel checks, minimize windows on test start, restore on completion
added call simplification
Fixed signing when no body
Set display Brightness
Working version that doesn't have links to links. That comes next.
Version creates anchor chape as shape. Need to modify it so creates
a first class anchor node.
Got node anchor creation working without detection of owning line segment
Anchor point translation and movement is working, but not bend points.
Anchor points move with bend-point creation, and deletion
Links to link anchor points mostly works
Removed UofE copyright notice. Put there in error since this file was
taken from Cytoscape.
Fixed bug in link deletion. Now fixed.
Refactored it. Basic ops work, not tested properties and label displays.
Refactored to eliminate facades. Made controllers handle graph elements
directly. Fixed bugs in reparenting.
Fix problems in editing and moving links, bend-points and anchor nodes.
Seems to work OK now.
improved index
Merge branch 'master' of https://github.com/stuycs-ml7/project2-pd6
wrote real spec for wb_china_geography
added vitus_vetted tag to japanese_variant search
removed extraneous space
Clearing out old blocks
Handle IO error if no banfile exists
properly set user agent with scrapelib
Add post-processing hook. Adjust documentation.
corrected the dynamic connectivity selection
Changed the base script so I can dynamically choose what kind of
connectivity to run on. 'within' (network), 'between' (networks),
'whole' (within + between)
Add my own syslog udp input
add script to dump creds out
Update the README
Correct a bug on the management command
Change system to implement an autodiscover on 'crumbs.py' apps file and apply a patch to implement lazygettext usage in titles
Use sublime.
Use global gitignore.
Set to simultaneously remove packages in LMDE with GNOME but not LMDE with Xfce
added symfony as a dep
Added tower definition
Other minor fixes
Added Tower id
Added tower array
Reformated tower object structure
Fixed try-catch to be atomic
Added sub_fields
redo automatic paginaion
long time due commit with 0.3 and 0.4 and lots of work on the firmware
update presentation
change topic
เพิ่มกิตติกรรมประกาศ
Parsed out Location information into pokedex.json, and cleaned up the UI a little
Update Textpattern logo on slugs, and add one at common standard size

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4024 2fea6a4d-a838-0410-917b-93a53c48e9d2
Update 'DrawTerrain'
New Radiotap stuff, though no decode function for that yet.
No dependency on include/<protocol> anymore, I wrote my own ones,
though they are far from being complete.
IPv6 should work correctly on big-endian machines now.
hiding the loading message when a graph is loaded.
I think she's finished, or at least presentation-grade. None shall know of your global variables, my dear
prove functionality and associativity of plus

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12486 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
PR#5637: invalid printing of anonymous type parameters (camlp4 revised syntax)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12668 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
simplified StepSlide view
new kinds Task, TaskList; updated toolbar headers

issues:
- StepSlide controls are not properly being destroyed
- TaskList are duplicating many tasks

might need to rethink my approach
working on refactoring things to use events and signals
resolving conflicts
added vs2010 solution for bigbang project
modified resource handling
re-added setBorderless call
Class product image
Line breaks in tagline
High score table design is MUCH improved. It now shows full name and is formatted into good columns. UPDATE LAYOUT FILE
Merge branch 'master' of github.com:thevoiceless/wc-testing

Conflicts:
	wahcade/win_main.py
added Pin class to pfio
Update app/code/core/Mage/Directory/data/directory_setup/data-install-1.6.0.0.php
fixing static url for Heroku
fixing static url for Heroku
merging Thijmen/Thomas, doorlopen AST tree en werk verdelen
The server now spawns a thread per mobot, fixed global speed issue
Fixed issue with switching robots to controll
Merge remote-tracking branch 'upstream/master'
将数据库连接由settings中改到存在在应用的models中
Issue #16

Added Dashboard model, controller and view.
2012-12-10
========
BugFixes
reorganization; styling;
Translated ver0.9.0
added only, skip, last
Checking in changes prior to tagging of version 0.07.

Changelog diff is:

diff --git a/Changes b/Changes
index 64d6cad..f14e0ca 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
 Revision history for Perl extension Text::TestBase

+0.07
+
+    - added support for 'ONLY', 'LAST', 'SKIP' for Test::Base::Less
+
 0.06

     - added 'run_is' function and 'uc' filter
add Japanese readme
Merge branch 'master' of github.com:tompng/screenxtv-client
index files...

Signed-off-by: Tonny Madsen <tonny.madsen@gmail.com>
Add Maven password encryption support (MGPG-31)

This change enables the use of Maven encrypted strings in ${gpg.passphrase}
or at the passphrase prompt. This would allow one to use an encrypted
gpg.passphrase in settings.xml.

See: http://jira.codehaus.org/browse/MGPG-31
Fix passphrase unmasking on backspace (MGPG-41)

The passphrase prompt (more specifically, the masking thread which implement
the passphrase masking) reveals the masked passphrase entry when the backspa
key is entered. During the entry, each character is correctly masked with a
star, but on backspace keypress, the entry is printed in cleartext with one
less character.

This change replaces the custom masking thread with Java 6's built-in passwo
prompt, which does not have this problem.

See http://jira.codehaus.org/browse/MGPG-41
Add README
Update pom for Sonatype release

This change edits the pom settings for a Sonatype release using this GitHub
repo.
updates to validator
Print message error
 Merge branch 'master' of github.com:toshidex/DefollowNotify
Print message error
Simplify mvn-install task by using an artifact:install macro.
Completed batch and stochastic gradient descent
Add support for the ATmega1284/1284P.

As we don't need exclusive features of these chips, simply re-use
the definitions for the ATmega644.
Split up config.h templates for the new Gen7 v1.4.
Allow the ATmega1284P on Gen7's.
Turn the PSU on before asking the endstops.
Adjust config.gen7-v1.4.h for Gen7 v1.4.

This means:

- Max endstops are gone.

- Min endstops are now PB0 / PB1 / PB2.

- Order of the steppers is inverted (X Y Z E instead of E Z Y X).

- All pins on port A one to the left (pin number - 1).
Align heater definitions in config.h templates.

Purely cosmetical, no functional change.
Importing Infinitum core.
Merge branch 'master' of https://github.com/ttreat31/Infinitum-Core
Added STL examples
make maps
Update the olccfetch command to download files in chunks to reduce memory consumption.
Updated number data, updated javascript version to include support for era
modify tweet_length to count URL as 20/21 chars
Merge pull request #61 from twitter/tweet_length

Modify tweet_length to count URL as 20/21 chars