labofsahil/github-event-dataset-2012 huggingface dataset:
Format notes as HTML feature
Problem 010 optimized
Merge pull request #131 from mitya57/master

Fixed `footnote_many_footnotes` test
Fixed not working "index" link in extensions documentation
2.6.29 - tradução até linha 1329
2.6.29
correção de tradução e reparo em strings
Re-work build process to build game source directly into an executable

This eliminates the raceintospace_game library, which turned out to not
really be reusable between components (e.g. utilities) anyway. It also
means platform-specific code can now live in subdirectories of src/game,
rather than off in their own netherworld.

At this point, Mac OS X is the only platform that produces a working
executable. Linux still produces a static library, and there's not yet
any CMake support for Windows.
Appease the clang static analyzer

FutureCheck() is called with type == 0 and type == 1, but m[i] could
be an undefined value if it were called with different parameter. This
assertion addresses this scenario.
Remove dead stores

These assignments are never read.
Remove unnecessary variable
Ensure safe memory access

Certain FName parameters could cause Help() to dereference a NULL
pointer. Guard against these cases with assertions.
Massive mostly-automated cleanup

I changed things because a machine told me I should. Specifically,
AppCode's inspection facilities indicated that a whole bunch of things
were unnecessary and could be safely removed. The game seems to work
after these changes.

Hooray, less code!
Fix options.cpp for astyle compatiblity

Turned out that the single quote in the #warn directive (introduced
in d335add7) was throwing off the astyle parser something fierce.
new example and changes to object
Support for configuration of Kerberos SSO authentication.

Basic support of puppet configuration for Kerberos SSO. If the value enable_kerberos
is set to true, puppet will install needed modules for apache and provide basic configuration,
which can be extended by the system administrator as needed. After successful authentication,
apache rewrites the REMOTE_USER header as X_FORWARDED_USER to be used by conductor.
管理画面内select要素のデザインが崩れるため修正
1.0.6J-r3 開発開始
Restore pre unicode c file
fixed String.prototype.startsWith
Added mop note to the app gallery
compress shell script is now more defensive
from sifero
Use no limit if 'search' is specified. bugid:107956
Overwrite the resize method in TinyMCE's template plugin. bugid:108771
Replace "{{theme_static}}" even in stylecatcher_libraries's URL.

bugid:108967
Regenerate gemspec for version 0.2.1
Merge branch 'master' of github.com:moviepilot/history_file
splitted the JS into its own module for clarity
Add the dep to webtest in travis
Bug 691580 - enable events/test_focus_contextmenu.html tests and logging
Bug 774330: Don't unnecessarily prevent code from entering the JIT with SPS enabled. r=luke
Bug 773586 - Initialize PICGenInfo::pc and clean up ICs a bit. r=bhackett
Bug 761249 - abort if ClassInfo2WrappedNativeProtoMap or Native2WrappedNativeMap fail. r=bholley
Bug 774464: Don't delete the sourceMapMap just because the 'putNew' operation failed. r=jimb
Back out bug 774139. r=bustage
Bug 774271: Improve DNS logging. r=sworkman
Bug 813264 - Restore inputmode attribute to nsIDOMHTMLElement as [noscript] to avoid IID change. r=bsmedberg a=akeybl
Bug 813264 - Restore MozColumnFill attribute to nsIDOMCSS2Properties as [noscript] to avoid IID change. r=dbaron a=akeybl
made terran header
Moved the csharp stuff into a subdirectory
Solution for #1 in ruby
Added a solution for #2
Added solution for #3
Added a solution for #4
Solution for #5
Added solution for #6
Add solution for #7
Added solution for #8
Added solution for #0009
Added solution for #10
added users scaffolding, more importantly added support of JS in the gemfile
Some updates to fix end to end behavior
Animate scrubber movement (and clean up scrubber-related code).
Add upper limit to timeline height
Fix margin at the end of the timeline
Port parabola intuition 1 to use a custom answer type
Port parabola intuition 2 to use a custom answer type
Port line graph intuition to use a custom answer type
Port derivative intuition to use a custom answer type
Port fractions cut and copy 1 to use a custom answer type
Port fractions cut and copy 2 to use a custom answer type
Port the complex plane to use a custom answer type
Fix TERMl reference error
Fix issues 28803 by rearranging validate
Stop using id's as globals (facepalm)
Derivative intuition review feedback
Remove unneeded KhanUtils
Add global events triggered when content loads, to then resize tutorial navbar
Merge pull request #28868 from xymostech/fix-28803

fix #28803; fix #28797
Login => Log in (when used as a verb)
Unbind empty answer handlers after each problem
Fix margins on views_of_a_function

https://trello.com/card/views-of-a-function-exercise-does-not-fit-on-screen-properly/4f8f257b0862d9183d031345/236
PE 3
Sections rearranged.
Remove commented code.
Attempt to fix #280.
Show scientific and localized synonyms seperated.
Remove article site. Just show in title if Wikipediarticle available and the URL to it.
Reformat according to our style guide.
Add a rectile to the google maps.
Fix usage of t().
describe connection between table and map
Merge branch 'master' of github.com:naturwerk/naturvielfalt into romixch
new group Käfer (alle), new order
made it so that you can equip a weapon and quite a bit of other stuff
Create participantInvoice
v0.7.1 change log
initial commit
Merge branch 'master' of github.com:nguyenlocduy/cache_test

Conflicts:
	.gitignore
Updating gemfile with rspec, fakeweb, and pusher-fake
blah blah the routes from express
Updating validator
Make reCaptcha configurable for creating users.
Getting private key from config
Replaced description for the 'enabled' key.
Preparations for User
Fixed lapack and blas get_info to work on OSX

changed get_info args to 'lapack' and 'blas' from 'lapack_opt' and
'blas_opt',respectively. The dicts for these new args include all of
the keys for these libraries.
add "/afk" command
Added wrapper classes for Video
cc.main event loop.
cc.loader -> ccloader
adding harrisonhe and victorchung
Updated readme
Changed package name to django-diplomat
Making default app to YouTube app that shows my video lectures
added chaper two; CREATE
linux.sh complete! Use it to run the program on Linux (and possibly other platforms).
fix double semi colon... too much colon.
pulling in content with  {{> content}}
Updated context migration to use new box migration plugins #144

My first take at the context migration didn't do too much with box plugin names because they'd be updated during box migration.  Now that I have a good number of boxes migrating, I went back to update context so it could get at the new plugin names.

The one thing of note in here is that I couldn't just create a new SpacesOverridesBoxes object for context to use.  I also didn't want to move the box port functions up into the general spacesoverride class.  Instead I made a new BoxPorter class.  SpacesOverridesBoxes and SpacesOverridesContext create an instance of that and have it do their porting.  It's not a full on migration class - just a container for the functions that port one box into another.
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Recent image widget filters vsite.  #868

Had an entity condition that should have been a field condition.  Now images are filtering.  Not all migrated images are making it in though.  Since gallery images are attached to a node, I'm not sure they have an og_group_ref of their own, since that's a field on the node.  This might require a full query intead of an EFQ.
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Cleanblue theme. Removed scholar from name. Additionally, updated theme css for D7
CP theme. Minor css update so menu remains normal font style
Removed comment line before css import statement so import can be read cleanly by all browsers
Cayley theme-add additional layout settings to info file. Remove comment before css import statement
Collegiate theme ported to D7. Initial theme checkin. Additional css style fixes are necessary. Will cirlce back again to clean up later.
Redhead theme. Initial checkin.
D6 buffer css file. Added lower container div padding
IQSS theme tweak
Added 1000px media format.  #1095 [status: needs qa]

Added format.  Noticed 600 and 800 were both large.  Made them large and huge, respectively.  1000 is giant.
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Don't render a broken 'website' link if biblio_url is empty.  #960
Avoid false positives with oo-admin-chk
Merge pull request #896 from danmcp/master

Merged by openshift-bot
OME-1: Fixed top influencers links
moved files from vc10

moved .cpp files to src
moved .h files to include
code review
got rid of STINKING eval. it was actually part of the return form for the macro, so it WASNT getting run at compile time. nasty. instead, wrap-event-handler sets up a chain of functions that wrap eachother in order to setup handler-case wrapping properly. works great.

also, commenting the shit out of everything.
Branje v float** ker to zelo pohitri SSE opreacije
pred eno optimizacijo?
experiment
Jow
use reStructedText instead of markdown for the article content
Implemented InorderPrint
Removed hack for ETICS
clean up of libraries we need
added validation of commands, only execute good commands and dont crash
added commenting of commands functionality
adding test file
class ColumnVectorSub
Fixed some bugs in the number functionality, and fixed some issues in the general TeX parsing
re-style keys
Merge branch 'UI' of github.com:pebblecode/Hacker-Typer into UI
Heurística 2 visa a menor palavra sincronizadora parcial
Applying patch process against 5.1.1
another parser overhaul, but this time it's looking more stable

notably, we now get the desired json-like structure directly from the
parser, instead of the fragile/terrible XML conversion
hiding edit and destroy links
0.0.1 snapo
0.0.1
0.0.2 faul tolerate
0.0.2
rpc
Enable npm test.
Add CI config.
Update readme.
Remove minify jake target.
fixed broken log args
Merge branch 'master' into txamqp-refactor
IE10 no longer needs -ms- prefix on gradients
modificação do helper de language
Requirements formatting
fix problem with implicit dirs in the zipfile. create a proper tree of the directory structure and fill out intermediate nodes
simpler/smarter path splitting
Merge branch 'zip-index'
Return Record on opening
s/disy/dist/
Quicklook Modal

Signed-off-by: Balázs <balazs@balazs-Inspiron-N7010.(none)>
Edited router to extend connect/express router. Oauth uses router to generate urls.
implementación de el método ejecutar()

Cambios en la clase Manager para que funcione.
Cambios en el for de prueba de contador y en el número de impulsos que
representan un segundo.
allow whitespace between three backticks and language name
Merge branch 'master' of https://github.com/mattnworb/vim-markdown
- started to work on texlive 2012
- moved authorindex style to bibtex packages
this was missed with last refreactoring
depend on ddp via github for now
bumped
bumped and bumped ddp new version
This is improve of the previous bug fix of GTM proxy crash at
reconnect.

In the head, surrounding logic changed from V1.0.x and we need
to be more careful to check what information is available at
the time of reconnect.

	modified:   proxy_main.c
Adding last days
Swapping old with new
Base Version of PkParser
This commit was manufactured by cvs2svn to create branch 'b3-5-0-patches'.

Sprout from b3-3-patches 2007-07-14 18:15:48 UTC cvs2svn <oct@openacs.org> 'This commit was manufactured by cvs2svn to create branch 'b3-3-patches'.'
Cherrypick from master 2007-07-14 18:15:46 UTC Klaus Hofeditz  <klaus.hofeditz@project-open.com> '- updated license information':
    categories.info
Custom install routine now also creates a menu module
Deprecated grouping_facet
Remove unecessary timeout
Updated to 0.1.1 by improving package dependencies
adicion de mensaje de errores cuando un ayuda no ha sido registrada
Complete elementary problems.
Updated, no longer running this as a service. That's for the app-developer to decide...

Signed-off-by: agoransson <andreas.goransson@mah.se>
move the call to ``paster create`` into the funcarg handler and pass in
parameters for that call via marker.
:-)
Fix: Test import/test_egg2 requires module pkg_resources.
Fix: Compile bootloader on Windows in virtualenv.
Color-coded frames
folder for bibliography
fixed errors and warning of print_composer.rst
Latest sublimecompletioncommon + Makefile for creating releases
Added local version of vcs_info
Custom vim alias when X11 support
Fixed a bug that would crash the server if a player moved from within
the range of their selected shop, to another world.
Refactor header generation
Minor adjustments on Readme files
part 4 - works better

added output parsing work
added new state info to readremoteservice
Exercises #9
Added non-arc support.
parseri muutoksia
twitter api version upgraded to 1.1
refactoring association functions
Using regular expression to detect void tags and add self-closing.
Branch for 1.6 release.
Merge some changes from main.
Adding release notes.
Merge branch 'master' into release
[maven-release-plugin] prepare release rest-driver-1.1.23
[maven-release-plugin] prepare for next development iteration
Merge branch 'release'
asset pipeline cleanup
Fix email address; add abstract
first try to get description into inputfield, not working yet
Merge branch 'master' of https://github.com/ChaoPang/molgenis_apps
Now the data will be stored at srm.grid.sara.nl, always.
Added Life Lines Reasearch Portal (LLRP) Demo. Moved this and LLRP and Life Science Pilot use case 1 (inforsense) to demo directory.
Created parameters file. Updated protocols
Updated lspilot1 protocols for cluster fully and grid up to step 9. Added workflow for grid.
We don't want generated script in git.
George improved protocols and removed automatic submission of pilot jobs.

Merge branch 'master' of github.com:georgebyelas/molgenis_apps
Updated lspilot1 protocols.
Removed execution bit from the code that generates jobs in both NGSDemo.java and PilotDemo.java. Actually, we should rename the classes, I think...
Added protocols for llrp and lspilot1 demo.
Added dataTransferCluster.sh with getFile and putFile functions on PBS cluster. Currently they only check whether a file exists. These should be improved.
Added LSPilot1_GridDemo.java to quickly put tasks for this demo in DB.
Added class that looks in DB whether there are new tasks to execute.
show investigation only when there are more than one investigation, otherwise only show the name of investigation
remove the wrong error message in catalog tree
with no selection in the tree, we are notified by the messagethat please select a variable in the tree
It only has measurements, protocols, All in the search options, details option is removed
We always insert generated tasks in the database, i.e., also if tasks are already present.
Fixed the order of services. api/pilot is now handled by its respective handlerequest.
bcp47: support comparing language tags
Fix building with clang 3.2
copyright notice, fix setup.py
Update css/fbmodal.css

CSS file extends the Pull-request file fbmodel.js.
Support for border transparency and no more tables.
Replaced all "fbmodel" words with "modelbox".
This is because Facebook is a commercial company and doens't like when you use their name.

You can set them back but then also update the .js file.
Adding a service.
Added functionality to unship an order
fixed readme
added nuget install command
attempting to get the nupackage to do config transforms
renaming files
got the config transforms working
Move the moment of inertia out of the constants file.
#PHP Link "Início" das páginas institucionais agora está consistente, botão add como amigo Correção de pt

- Link "Início" das páginas institucionais agora está consistente,
antes umas páginas mandavam pra Perfil outras para a raiz. Agora todas
mandam para a raiz
- Nova área de info dos perfils dos outros com botão Add como amigo
- Correção de pt em imprensa
- Adição de novas instirucições parceiras
Modified readme

Signed-off-by: Marco Rivadeneyra <rockiano@gmail.com>
Added blog, post and comment models and migrations

Signed-off-by: Marco Rivadeneyra <rockiano@gmail.com>
Start IO::Output testing
Set $0 to be the program to be debugged.
Separate elitism from termination.
Handle errors in conditions on transitions.
added wp7 images, fixed some css issues in smaller screens
Rebase from 'release/srdfdom' @ version '0.2.3'
Generated debian files for quantal
Go to sleep after the cron job has finished
Uncomment an accidently commented out echo
Add option parsing
Pass --continue when building to get as much done as possible
Support HTML entities in addressbook names
modity the output files' name
Fix admin header search
Add new translations for recordings
Open last mail on click
Added the ability to add server groups during bootstrap
Merge pull request #5 from greenalto/firewall

Added the ability to add server groups during bootstrap
:744 "ActiveRecore" should be "ActiveRecord" 
Merge pull request #52 from 046569/patch-1

:744 "ActiveRecore" should be "ActiveRecord"
gi: add ArgInfo#return_value?
Database and Users
Added Agree,  comments test
Removed the wff methods.
Split the different methods into classes. Assigning meaningful variable
names. Adding comments.
Do it without regex
Simplify how code same text is set and colored
Add plugin infrastructure and better error detection
Dependency-less and simple descriptions of each plugin
v0.1: added button functionality, item picture updatefor all slots
added major items and champions
added modified combobox, functionality complete
SAK-22438 mocks

git-svn-id: https://source.sakaiproject.org/svn/sakai-mock/trunk@111514 66ffb92e-73f9-0310-93c1-f5514f145a0a
Fix linux build (thanks Ian Monroe)
Fixed Queue, Node, and added Tests
Switch from less to sass.
Remove last less file.
Make button-placement better.
Working on sass structure.
Add send results button.
Made the comment box more useful
Fixed mantis issue on number of fuel stations

The sql query is modified as per the preferences
change the config properties for ebi deployment
Emit native modifier.

Emits native modifier for methods that
have @native annotation attached to
them.

Added test-case covering this change.
Merge pull request #56 from gkossakowski/native-modif

Emit native modifier.
Moved the stats broadcasting back to StatsServerUDPLink again
Version bump to 1.1.0
fixing gem loading for Rails
Add fst templates
Merge branch 'master' of github.com:scieloorg/delorean2isis
Add Primo Web Service engine.
Remove incorrectly named class.
Remove meta-sakoman dependency
Forms: add 'wrap_each' parameter
don't check for empty value for single or multiple choice
add the ability to add a hook to be run once
tried to add movement code, failed
Merge pull request #388 from seanpaultaylor/next

Added xcode project to gameplay workspace.
Added tap and swipe gestures to Android with basic impl. since Android doesn't support gestures in NDK.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Syntaxt error in postgres
enabling main features
added buzzer configuration, changed on_delay handling
change add_new_user
modified:   dotfiles/.config/awesome/rc.lua
	modified:   dotfiles/.config/awesome/volume.lua
	modified:   dotfiles/.config/awesome/widgets.lua
	new file:   dotfiles/.mpd/log
	modified:   dotfiles/.mpd/mpd.db
	modified:   dotfiles/.mpd/mpd.pid
	modified:   dotfiles/.mpd/mpdstate
	modified:   dotfiles/.mpdconf
	new file:   dotfiles/.ncmpcpp/config
	new file:   dotfiles/.ncmpcpp/error.log
	modified:   dotfiles/.xinitrc
	modified:   notes/arch install
Revert "new"

This reverts commit 1db700bbcec83ecbd9fc55afcd42e03049ad2b19.
Update

files needed to work with this library
fjkh ioreoiuvh
reorg imports
Merge branch 'options' of https://github.com/sigmavirus24/GITenberg into options
opt_str to opt_val
Merge branch 'options'
homepage – vote box. The vote title should be in two rows. Now if the title is too long – it’s cut in the middle.
added test expectation for test-compositor
Teach the test-harness to maintain the current test when the page is reloaded.
Merge pull request #3 from dstockwell/harness-reload-same-test

Reload the same test when reloading the harness page
Added test expectations to test-iteration-start (and fixed up spacing).
fix test-parent by reordering parentGroup tests..
Add test expectations to test-svg-anim
Add test expectations to test-to-animation.
GroupedAnimFunc interface.
GroupedAnimFunc implementation
Added property bag constructor and test.
Added test expectations. Added test to test harness.
Merge pull request #4 from shans/add-test-expectations

Add test expectations to some more tests.
Added length member to GroupedAnimFunc.
Merge pull request #5 from shans/groupedAnimFunc

implement grouped animation function.
changed secondary navigation
Tweak example to show simple default usage
Merge pull request #1 from shaunjohn/master

(My 1st push!) Mark Chang about.me link
Don't ignore database config
Merge branch 'master' of github.com:emorikawa/startupschool
Merge pull request #2 from shaunjohn/master

Added the Social Hook
Merge pull request #3 from shaunjohn/master

Adjusted spacing around social hook button
Added word cloud to details section
Added word clouds to curriculum page
New tag clouds. More spacing in curriculum section. Headers align better now
Added Evan Morikawa to operating team
Can now navigate to a section of the page using hash links. Replaced quotes
Changed content - In a Nutshell

Updated "In a Nutshell" content per Aaron email
Improved pane-separator
Improved share description logic
Reduced page width to original
delete tap
added support for cross platform packages.
event export from activities calendar
#reqestToken
Remove requirement to subclass Alert for programmatic usage
Add dijified Affix
Prepare sixieskel-dev 1.8.
asas
Merge branch 'master' of github.com:sjtuadamyang/589Project
За слободен софтвер, текст од ЗЕЛС саемот на македонски
Rescaled movement in simulation to newskye mavlink messages
Win32: Updated game plugin version metadata with "lib" prefixes
Win32: Corrected game plugin filenames in the version metadata

On Windows the shared library filenames don't actually have a "lib"
prefix…
Snowberry: Removed game plugin j-prefixes from language strings
Refactor|de::Game: Replaced game resource iteration

Previously public access to the resources of a de::Game used a
less than ideal iteration mechanic based around a null terminated
array of pointers.

Internally de::Game now uses a QMultiMap to contain the resources
and the public resources() method now returns a const reference
to said container.
libdeng2|Added: A couple of new utility routines for file paths

* String::expandNativePath()
Works similarly to F_ExpandBasePath() in libdeng1.

* App::nativeWorkPath()
Because asking QDir for this seems semantically wrong.
Documentation: Fixed apidoc for String::expandNativePath()
Refactor|StringPool: Added a C++ interface to StringPool
Refactor|PathTree: Use the C++ interface to StringPool in PathTree
WadMapConverter|Refactor|Id1Map: Use the C++ interface to StringPool in Id1Map
Refactor: Use the C++ interface to StringPool with the (map) entityDefs
Refactor: Renamed r_models.c/h to resources/models.cpp/h and switched to C++
Refactor|Models: Use the C++ interface to StringPool with the modelsRepository
Refactor: Switched edit_map.c to C++ and some minor cleanup
Refactor: Use the C++ interface to StringPool for the missing material dict
Refactor|StringPool: Dumped StringPool's now redundant C wrapper API
Win32: Removed generated deng2.rc from repository
qmake|Win32: Fixed tests.pro, added "deng_nodirectsound" option

The main config.pri was not being included from tests.pro, which meant
that the user's configuration was not being applied.

CONFIG+=deng_nodirectsound will disable the DirectSound sound driver.
Fixed: Compilation error and warnings

On Unix, include the headers needed for getpwnam().

Instead of forward-declaring nested classes, it's better to just include
the relevant header.
FluidSynth|Unix: Use the system's libfluidsynth

Instead of the embedded libfluidsynth under "external" in the deng
source tree, use pkg-config to build with libfluidsynth installed
on the system.

On Mac OS X, the embedded FluidSynth is the default. On other UNIXes,
the system libfluidsynth is the default.

The configuration option is "deng_embedfluidsynth" (default: not set).
FluidSynth|Unix: Use the pulseaudio driver by default

When using the system libfluidsynth, by default use pulseaudio as the
output driver.
Fixed: Crash when a model was not found

Uninitialized pointers could be returned.

Also, added missing headers for a Linux build.
A couple tec files
DRY + test
Add unsolicited status update feature.

It is here that I begin to wonder how much RAM I'm using. 4K should be
enough for anyone, right?
define away our response values
Added extendObject()
minor update
added QB.filter options and fixed backspace bug
created bash object with Script class which is the foundation for evething onwards
tester for the bash object
classy-prelude 0.3
classy-prelude-conduit 0.3
Prelude category (#7)
Better mapM, mapM_
Make content scrollable

Interim solution to either:

1. making the site 1024px wide
2. using javascript to make the sidebar scroll horizontally
Styling for lists in media plan
Change twitter text from "Vote" to "Support"
Add FastCompany press link
Spacing
Fix styles on terms of use
Update styles on privacy policy
movie-database-0.6.8:
- bug fixing
Added condition-safe check.
Fix fd leak on window resize/unrealize/etc.
#45 now only fetch from original domain
added text to the main page
changes
added link to video rec for webpagetest when SPOF is found
typeo
more changes
fixed video link to work
Merge branch 'master' of github.com:soulgalore/sitespeed.io
added time to first byte
cleanuped varables & changed names of input params for proxy
3 decimals for ttfb
added ttfb and removed cached page size
ttfb
show time to load in seconds
show time to load in seconds
Resized partitions. Experimental build.

Took a piece of code from JBMP kernel just to see if custom MTD partitioning would work on HTKernel. Please don't build using my source until this is proven stable.
Ignore pattern should have star in the beginning.
Got unsigned byte working
Merge branch 'development' of github.com:spudstud/All-Spark-Cube into development
Added the ability to attach arbitrary metadata to a download.
Made url and userInfo readonly.
added basic lexer and parser
Change mplayer to omxplayer for Raspberry Pi
refs #6 dont use deprecated method
Fixed project via james
fixed frame 
Merge branch 'master' of
ssh://git@github.com/starpolygon/Starpolygon.git

Conflicts:
	PrjStarPoly/src/Frame.java
fix: release candidate issue in numpy and scipy version numbers
EX: Update import path in example
BUG: Use correct index
Added fallback to Benchmark
Update claim.
Add some info the the README
Moved things around to support testing on Android
Moved things around to support testing on Android
readme
readme
Merge branch 'master' into ghpages
More Stuff
Merge branch 'bootstrap' of github.com:blueriver/MuraCMS into bootstrap
Adding stripe() calls back in.
Merge branch 'bootstrap' of github.com:blueriver/MuraCMS into bootstrap
Adding stripe() calls back in.
Removing pulse from save sort button.
Switching color picker
Fixing issue with Railo field sort.
Hide all panels whenever opening a link in a new tab.

close #17
Merge branch 'issue_17_close_panel_new_issue' into dev
Grab VS product key from environment variable
added resource delete
Commited some changes
Message
just pushing files here
Hi
hi
fixed rate, edited app
updated rate.html
Merge branch 'master' of https://github.com/stuycs-ml7/project1-pd6
changed a bit of rate
message
Quick Fix
Merge branch 'master' of github.com:stuycs-ml7/project1-pd6
Commit
AAAA
message
weekend adventures
Combined templates/style.css code into static/styles.css code
Merge branch 'master' of github.com:stuycs-ml7/project1-pd7
added stuff more efficient
Merge branch 'master' of github.com:stuycs-ml7/project2-pd6
curate the artist query to not cause urllib2 error
Merge branch 'master' of github.com:stuycs-ml7/project2-pd6
switched things
Merge branch 'master' of https://github.com/stuycs-ml7/project2-pd7
remove comma
frontpage back to staging state
Merge remote-tracking branch 'origin/master'
allow setting custom content type and custom header
Restyled code with pep8
A wild FAQ appears!

We have a real (draft) FAQ. Suggestions welcome.
table margin edited
-fix wrong intend on github
Finish the initila implementation of the checklist
fixed registeration
follow all url shortening
add missing break
remove 30X handling
add other tweet url
filter tumblr
filter hamusoku
use push
code cleaning, better state printing
clean message
pass missing argument
データ構造を少しいじった
Commenti alla print()
forse ci siamo quasi!
Center link under image
Double spacing between [preview] and [pdf]
working@
Upgraded dependencies: DropWizard (implicitly updating Jackson), JUnit, Jetty-Servlets

This required:
 * Changing imports for Jackson from org.codehaus to com.fasterxml
 * Rearranging the Service implementation: code moved out of constructor into initialize(), and out of initialize() into run().
 * Gutting the AppTest (not that it was really a test anyway).
update symbolmap format
Client does all tasks except give the correct output for the packets it receives from the server.
TODO: parse network packets and output proper messages.
fixed first section padding
Merge pull request #27 from terrancerobb/master

Minor style fix
Add GPLv2 license header to sites directory

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@5055 2fea6a4d-a838-0410-917b-93a53c48e9d2
Add GPLv2 license header to lib directory

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@5056 2fea6a4d-a838-0410-917b-93a53c48e9d2
Add GPLv2 license header to textpattern directory

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@5057 2fea6a4d-a838-0410-917b-93a53c48e9d2
Add GPLv2 license header to root directory

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@5058 2fea6a4d-a838-0410-917b-93a53c48e9d2
Obey permlink mode in <txp:popup type="c"> with "section" or "this_section" set.

Fixes issue #200.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@3793 2fea6a4d-a838-0410-917b-93a53c48e9d2
commiting changes to crud on project 1 and ds store file
Changed Student Contact to use 30 VARCHAR for all the names, and update the db backup
Tweak styling on issue source boxes
Make milestone scheduled/started dates timezone neutral (a milestone would not start a day earlier/later in some other place to another!)
Perform previous tweaks to builds and editions too
Merge branch 'next' of github.com:thebuggenie/thebuggenie into next
added ofxJSON to OSX side
add test cases for PR#5673

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13165 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Small changes to UISegmentedControl
attempted to fix the jedi mind trick bug by writing 0xff to GPPUA (0x0C)
updated bundles
Merge branch 'master' of github.com:thomaspeklak/vim-config
Add -update to cp command
Big Crunch
Il faudra recoller la caméra sur le HardwareSerial, mais sinon, ça va.
Test avec filtre IR uniquement.
Prise en charge de la reception de données depuis la station au sol
Fonctionnement OK entre station au sol et le programme de la Arduino n°1
Se agregan alguna diapositivas sobre procesos en Linux.
added an everything event accumulator
Se soluciona problema en la relacion entre articulo y proveedor
changed database name in EfDataContext constructor
Fix prototype and JQuery conflict.
2012-07-18
========
PnlInfo further development. Not yet finished.
Created ICD10 module (in progress)
initial organization and push;
Minor clean-ups (doxygen work continues).
Minor style clean-up here and there.
Add license file

Cabal produces a warning since we don't have one, but specify one
Set up test-framework

Largely copied from http://ics.p.lodz.pl/~stolarek/blog/2012/10/code-testing-in-haskell/
Set up QuickCheck as part of test-framework
added working db-Connection
Entries with duplicate text - update timestamp, etc of original instead of adding a new entry.
grammar, roadmap update for TB 2.1.2
- uWSGI support
- django template.
Parser errors in other files will show what file they're from.
Add function to convert long to varchar2
Update error function to work with NOT NULL constraints
Merge branch 'master' of github.com:trent-/aErrorCustomiser
cron service
fixed launching problem
Cherry-Picked Atmos Force Allocation Update
Fixed Pitch Overwrite Issue
wip
throttle still strange
Added todos to .gitignore
Replaced prototype by jquery to make bootstrap alert plugin work correctly
Refactored JavaScript code to work with jquery
Load locale files from config/locale subfolders
Fixed wrong path
Removed deprecated partials
Moved all localizable strings out of application files into separate files under config/locale
Minor change in alert partial
Minor fix
Updated TestFlight for the 1.0 SDK
Leave TestFlight enabled even in production builds
Send UDID to TestFlight only in DEBUG builds
hotspots frontent
inclusao de um icone do twitter como padrao ao carregar.
Inclusao do parse ao concluir a leitura de uma materia.
New and improved README file
Lots of changes to structure, new build and changed building options heavily
Fix link reference in home page.
chap-links-library stub
Bundlerで管理するように変更
Removed invalid characters from Civil War converter's output.
Added TextUtil; fixed bug in wiki geo filter.
Fix for _processDotPath in Environment class. Fatal error if we try to get value from array but it variable is not array
new library/import syntax. mongo.dart renamed to mongo_dart.dart. Couple of == operators
Update newsreader/NewsReader/src/org/openintents/provider/News.java
factored out payload type, bplustree deals with byte[]
implemented Commit and rollback! TODO root address/stream lenght
tex file2
metatags
Merge pull request #21 from vdclouis/Louis

css folder update + footer deels
uncomment php
Init Styling and build

We have started including stylesheets and tweaking the CFWheels
framework.
Started Authentication
script de conexao ao sql server
Updating the whitepaper
set myself as maintainer
revert version number to 0.2.0 instead of moving to 0.2.1.
remove gitit pages.
use Setup.hs instead of Setup.lhs.
update url and VCS.
cleanup ; klavaro update ; wireshark update ; waf update
Relocate the generator and update it's superclass.
puppet cli tests
sorted the config
'tab-size' supported in webkit
Fixed bug in user commenting logic.
writeToFile is working
Ignoring .rvmrc and providing a sample
QML Alerts: Initial scaling work

    * Set size based on tablet/phone UI
    * Scale window using layoutScale
    * Pass uiScale, textScale and layoutScale through to QML items
    * Scale DismissCardTutorial.qml using passed values

Open-webOS-DCO-1.0-Signed-off-by: Josh Palmer <jpalmerwatkins@me.com>
UI Scaling: Scale tiled pixmaps

* Correctly scale 3-Tile H/V Pixmaps:
  Launcher Tabs
  Launcher Tab Dividers

* Correctly scale 9-Tile Pixmaps:
  Search Pill
  Done Button
  Popup background

* Tidy up PixmapObjectLoader::loadMulti

Open-webOS-DCO-1.0-Signed-off-by: Josh Palmer <jpalmerwatkins@me.com>
App Icons: Scale Launchpoint & Updated App Icons

* Loading app icons are now scaled properly
* Icons that update on the fly now scale correctly
  (ex. Calendar)

Open-webOS-DCO-1.0-Signed-off-by: Josh Palmer <jpalmerwatkins@me.com>
Notifications: Scaling Work

* Non-lockscreen pixmaps & layout are now scaled
  (Untested as notifications currently crash on GNex)
* Lockscreen Dashboard pixmaps & layout are now scaled

Open-webOS-DCO-1.0-Signed-off-by: Josh Palmer <jpalmerwatkins@me.com>
Virtual Keyboard: only add Luna UI specific signal handling when running in Luna mode

Casting to WindowServerLuna results otherwise in a SEGV in the Qt connect method as it
gets an invalid sender object it can't connect the slot to.

Open-webOS-DCO-1.0-Signed-off-by: Simon Busch <morphis@gravedo.de>
update apt after source added
cleaned the code, added google copyrights
Revert "Correctly do reductions on global dats for indirect loops"

This reverts commit 2a9eafa7e1f71cb198102e2d5d41679b59ce5801.
Create correct variable name for non-reduced global args
Zero local reduction arguments in indirect kernel code
Correctly calculate required shared memory if reductions occur

Previously, we always assumed that the shared memory size was only a
function of either the plan (in the indirect case) or the number of
threads per block (in the direct case).  With reductions this is not
true.  We need to use the max of the dynamically calculated shared
memory size and the shared memory required for doing the reduction.
Add liveness analysis.
Honor liveness in DICM transform.
Implement boolean shortcut folding.
Excluded the generated test cases
redis client can now be set directly via DulyNoted.redis= (and not only by URL)
update redis dependency to 3.0.0
respect the prefix borders in DulyNoted.find_keys ("pageviews:users:1" shouldn't be returned if searching for "pageviews:user")
support for base64 encoded keys
call to_s when normalizing (support for integers and floats)
Merge pull request #2 from lacco/master

Several improvements
Made the robot parts add and/or subtract from durability
message for your changes. Lines starting
Remove suhosin and pspell packages
Update phpMyAdmin link to 3.5.3
Add apache2.2-common in the list of packages to purge
APT #3 without extra credit finished.
APT #3 done with extra credit attempted.
Small optimization: Cache hasOwnProperty
moved agent and map
add configfile and installdir
Poke travis CI.
Poke travis CI.
Revert developer convenience. Borkes intree packaging
More thorough testing; ability to kill tasks
Added external module loader and new ModuleSay (mostly for testing). Updated ModuleBasics and things to update and save config of bot
add Clojure 1.4, remove deprecated code
Fix Rakefile to suit new rspec and rdoc APIs
I am trying to boot my OS with grub.
But there is some error, I am afraid my host OS
Just in case, I upload uncompleted source
Corrected logo and fixed footer css classes
Bug correction: GoogleTasksActivity didn't finish when adding task and not authorized.
Merge branch 'master' of https://github.com/xisberto/phonetodesktop
Releasing version 1.1.2
first part of jstp-20
getting closer
working version of JSTP-20
merged jstp-20 to master and incremented the version numbers of the pom.xml files
removed commented-out code
changed 'entityType' to 'concreteType' to avoid ambiguitity. Also incremented the version number
moved test 'concreteType' from the implementaions to the interface
extend the EntityFactory to work with interfaces and incremented the version
extend the EntityFactory to work with interfaces and incremented the version
Merge pull request #1 from john-hill/master

Adds support for interfaces and abstract class as fields of POJOs (JSTP-20)
Corrected the version number to 0.2.0
增加Tools工具

包括JS合并、压缩、根据文件中的注释标识符进行替换等
Refactoring queue_t.c
adding domain validation on registration and edit
Edited from past tense to present tense and corrected variable name and added periods to the sentences.
Collision fixes in new snow maps.

converter run, submodule updated.
Expand seasonal quest to be available during a londer period and fix how the time is checked.
Blue sage quest: fix and addition in bookpages subquest

- Fix logic that determines if a bookpage is a new one to decrease with the amount of successful pages.
- Different dialogue depending on the amount of successful pages the player already brought.
Blue Sage bookpages subquest: modify the formula to reduce the presumptive amount of pages needed, based on feedback from Nard.
Fix a bug in Hasan that can cause him to be blocked infinitely.

This was caused because the player could log out after the blocking variables were set,
but before the timer was started that would free the NPC after a timeout.
Towel Event: add a missing $ behind a variable name. Reported by v0id.
Running the converter to repair the collison files for 046-1 and 047-1. Submodule pointer updated.
Add Reinboo to the list of monsters that annoy Sagatha when you kill them.
Fix of the towel spellinvocations. Their numbering was off, causing some answers not to work.
Expanded the debug NPC script and added new variables in const.txt.
Changed all SKILL_WARRIOR_RAGING entries to SKILL_RAGING.
Added new emotes to const.txt.
Cosmetical changes in const.txt: added comments and replaced all tabs by whitespaces.
Use newly defined constants for SKILL_EMOTE, SKILL_TRADE and SKILL_PARTY instead of local variables.
Entertainer: also allow the new smileys to be randomly displayed.
Towel Event: ask for the amount of "pints of beer" instead of "beers" to avoid confusion. Suggested by GonzoDark.
Adding new item Antlers to item_db and as drop to the Reinboo. 'make indent' ran and submodule pointer updated.
Some changes in tutorial to make it easier:

- Hint in Hasan's dialogue to talk to Kaan.
- Hint in Kaan's dialogue to talk to Sorfina or Tanisha.
- Sorfina offers free heal as long as the player didn't complete the tutorial.
fixed typo "famos" to "famous"
fixed messed up tabs in views.py
[cmake] 4.2.7
[cmake] fix po domain name
Override
Code cleaning
asdf
Merge branch 'master' of https://github.com/zdavatz/pharmacokinetic

Conflicts:
	README.md
Merge branch 'master' of https://github.com/zdavatz/pharmacokinetic

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master'
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
x
Merge branch 'master' of https://github.com/epha/pharmacokinetic.git

Conflicts:
	README.md
Added Pharmacology
Updated README.md
Update README.md
MostPopularByAttributes: write dictionary access more C#-like; add paper URL
Fix permisison message when checking in silent mode.

It was actually being sent by the built-in permission checker, not by
the handler itself.
Fixed error when clicking non-commandsigns

Never checked if the block was actually a commandsign...
Tiny fix: AZCoreRecordManager's variables should be @private, since on iOS we're not technically *in* a package.
really fix auth ?
Middleware now survives even if request.user doesn't exist (as may be the case e.g. when using mediagenerator in development mode)
Include the question mark of the query string in file names, even if there are no query parameters. This eases rewrite rules in Apache. Encode the question mark as %3F. This makes it possible to use Apache in front of staticgenerator.
Save AJAX requests separately. This makes it possible to use staticgenerator on sites where some views return different content for AJAX requests than for ordinary browser requests.
Added the @disable_static_generator view decorator
Bumped version number
Add the KTweaker as an app for build
Fix STARTTLS handshake error in Email's SmtpSender class

The Email.apk checks for "-STARTTLS" in the SMTP server's EHLO response
but SMTP servers may respond with STARTTLS on the last line as such:

250 STARTTLS

Or even as part of a line as such:

250-XSECURITY=NONE,STARTTLS

Checking for "-STARTTLS" in this case will break. The fix is to simply check
for "STARTTLS" instead.

See http://code.google.com/p/android/issues/detail?id=19109
And http://code.google.com/p/android/issues/detail?id=2309
This update was originally commited to AOSP master and recently merged
into CM.

Change-Id: I3a590a4398cb664f46875650550986a67f320f76
Architects create bpts properly now + some bpt library fixes
Added ClassMapping for String[] and finished bpt library fixes
correctly save and restore hasPulsar()

unfortunately since this is done by BptBlockPipe, the hasPulsar and
addPulsar f'ns need to be promoted to public.
teamcity: use running:any instead of 404 to check for running build
remove old configuration files in distribution, now they must be in src directory
Small changes. Maybe something is broken, please check
Change experiment setup.
Centralizando Teste #1
Fixed small UI bug with Profile Editor
Fixed bug with disposing Game Adder
Merge branch 'master' into cleanup
Fixed bug with reading title string
Fixed bug with Creation Wizard
Updated version to 0.0.0.2
Fixed version issue
Merge branch 'master' into cleanup
Added New Clock and formatted source
<< Incoming setOnPlaying method >>
only bcnf and 3cf complies
new manifest and coordinate field fix
- Correction de petits bugs
- Amélioration du référencement
Nagios check plugin for release team cloud
Fix host option use
renaming jsonPayloadExamples to dataExamples

[otf:9249]
updating readme

[otf:9421]
Nomina: simulation of the result price setting
Help Screens and styles.xml changed
Implement configuration system.
backreference
4 new lines
French.Lua: Misc & NamePlates done
Reduced default WRITE_SLEEP value from 8 to 6, for 25% faster writing and erasing
adjusted default duration down to 2.0 seconds from 2.5 seconds
Restructured firmware/releases folder, and added a 2.0 seconds build of 1.03
fix makefile to clean some uncleanly files
Change back to 2.5 sec bootloader delay - 2.0 seconds wasn't working reliably enough for my taste
Firmware Release! 1.04 is now out.
upgrade: Add micronucleus 1.04 upgrade prebuilt
Release Notes for 1.04 release
Implement credits stage
adding geronimo-web.xml files to major war projects
deploy false for web projects that couldn't deploy
Merge pull request #14 from bhumphrey/jaxb-ear-deployment

updated the the libraries required for ear deployment
Added serialConnect and getSodaInventory to sodaMachine.
move the setting of the user function back to execute ; but guard against adding the same one again
Bump version
added edit action to workouts
employee login working5
Minor change to FileVersionCondition

A minor update to FileVersionCondition to strip ".*" from version
strings such as "2.1.*".
Move images to new system
Handle ambiguous column names when joining two tables

- idiorm.php: prepend table_name when in a WHERE clause
- test_queries.php: add test joining two tables with WHERE clause
Fixed names
Prefix must be '.'
Register handlers and listener
Cleanup
added jquery datumtijdprikker
Update clicraft docs

Update after commit to clicraft git repo.
Add meeting 10 post
My conclusion first part
Fix conflicts
Removed hardcoded
updated the email again and adjusted the error handling
more email and fixed the user session on register
I think the agency thing is starting to work
moved window.name fallback code into a single method as it's called twice
bug fixes  :PPPP
Merge branch 'master' of https://github.com/DomiBosselmann/Kartenapp.git
use a more general approach
Improvements to Composition

Changed view composition so that when compose is used by supplying a
view, but no explicit view model, the composition preserves the parent
binding context in full, including root, parent, etc. A sample was added
to demonstrate the most basic scenario.
fixing /session/:sessionId/window (DELETE)
Merge branch 'master' of github.com:Element-34/php-webdriver
Fixing typo.
Merge pull request #2 from paveq/master

fixed typo
Adding a better layout for my resume
Refinements to make events behave more like "normal" evnets.

Adjusted events calling so that options are preserved and passed along,
as they are with "normal" events.  Also switched over to using the
Backbone.Model::change method so that events are raised more like
"normal" events.
Updated prog3 solution.
re-adding sprites.less reset, new test.html for visual testing, many many bug fixes, new icon
Fixed netvsc halt panic triggered by "ifconfig hn0 mtu ..." only
when INVARIANTS is compiled in.  (WITNESS is also compiled in, but
is not believed to be a factor).  Problem was in halt code, where
code was not waiting for command completion before freeing request
and other resources.  Code now panics in vmbus code (INVARIANTS
only), so another bug needs to be addressed.
old sf.net lib plugin added
Konvertierung umgestellt auf eclipse boardmittel
warnings fixed
enablement added
local refresh of converted files implemented
Minor edit to SConstruct to work with python 2.4.
Merge branch '#197'
made DoubleGaussian flux params non-optional
(#175)
Merge branch '#175' of github.com:GalSim-developers/GalSim into #175
Add json versions of config files.
(#148)
Minor style changes
(#148)