labofsahil/github-event-dataset-2012 huggingface dataset:
Merge pull request #192 from devkral/various_fixes

fix second compile bug with llvm 3.1
[pulse] Simplify device list logic
[pulse] Virtualize volume and limit it to device max

AKA support for pulseaudio flat volumes
[tests] Add a basic test for Loader
[LoaderInfo] Fix access to not initialized ::applicationDomain
[VM] fix constructFunction for functions without body and

implement getDescendants for proxy
partially implement font handling

Font class is renamed to ASFont to avoid problems with X11 font class
currently only font name and size are implemented
make lightspark compatible with older boost versions again
[tests] Improve DisplayObject test
[DisplayObject] Improve ::getBounds against unrelated target
Initial work on unifiying strings used for traits
[VM] Simplify registration of builtins
[VM] Collapse NAMESPACE and PACKAGE_NAMESPACE
[VM] Fix Null::getVariableByMultiname
[VM] Introduce namespace pooling
[VM] Improve protected namespace support
[Array] Support DESCENDING is sortOn
Fix atomic primitives
[VM] Move towards private namespace support
[VM] More progress towards private namespaces
Label väri.
Jos on myyntitilaus kyseessä.
$toim fix
Label = Luokitus

Tallennetaan kantaan avainsana.tunnus mielummin kun css-värikoodi. Nyt luokituksien värejä voi vaihtaa "lennossa". Jos luokitus poistetaan, niin väritkin katoavat.
Merge pull request #301 from devlab-oy/sami/label

Myyntitilauksen luokitus
Siirtolisteille flägätään AINA ei_lokeroa jos on pakkaamolokerot käytössä!
break lisätty
Uusi funktio sähköpostin lähettämiseen.
Tulosta lähete käyttää uutta sähköpostin lähetystä.
Käytetään uutta sähköpostinlähetys-funktiota.
Vanha sahkoposti.inc takas.
Uusi sähköpostin lähetys funktio.
HUOM.
Pyöristetään desimaalit sallittuun tarkkuuteen.
Merge pull request #200 from devlab-oy/joni/email

Mergetän tämän, vaikka muutosta ei tehty läpilinjan. :/ 

Pakko saada tuo ostolaskun poisto tuotantoon samantien. Sähköpostin lähettäminen muualta tulee korjata myöhemmin.
Muutettu varastoon valmistuksen JT-toimitus

Toimitetaan vain valmistettua isätuotetta, ei KAIKKIA firman jälkitoimitusrivejä.
Laitetaan myös keräysprioriteetin kuvaus keräyslistalle.
Submit nappulat nimetty!
Kaks form feediä.
Tulostetaan kaikki keräyslistan lähetteet samalla jos niin halutaan.
Parannettu "tulosta kaikki" oletustulostimen valintaa.

Valitaan varaston oletus "keräyslista" tulostin oletuksena "tulosta kaikki" dropdowniin.
Optimoitu. Speed x 10.

Sortataan tietokantan kenttien mukaan, ei subqueryjen mukaan. Limit ei nopeuta lainkaan, koska subqueryn mukaan sorttaus vaatii, että käydään kaikki tietueet läpi.
Parempi haku asiakasalennuksissa toim_ovttunnuksen mukaan.
Merge branch 'master' into jamppa/api
API virheiden korjauksia

Data puuttuu virhe lisätty ja headeriin korjaus.
tuunausta
Puolipäiväraha where ehdot poistettu.
Lisätään tarra-aineistolle yhteyshenkilön titteli
Merge pull request #263 from devlab-oy/tomi/yhteyshenkilo

Lisätään tarra-aineistolle yhteyshenkilön titteli
Onko kolmiokauppa tyhjä vai ei
automated commit from dev@dmehta Wed Oct 10 22:00:01 EDT 2012
Fixed blank page after install
Minor changes - prepare for net-split.

Do not modify output buffer between yield points:
in net-split, multiple fibers work on the same
session, and append output to the same output
buffer.
Merge git://github.com/mailru/tarantool
Move hook at txn_commit to right place
Fix sigsegv in wakeup_fibers
Added Adjustable mDNIe settings @myfluxi
initial commit
Merge https://github.com/dhbikoff/Podcaster
added pm3d transformation
[feature/postgresql-fulltext-search] PostgreSQL fulltext search, version 1.

PHPBB3-9730
[feature/postgresql-fulltext-search] PostgreSQL fulltext search, version 2.

PHPBB3-9730
[feature/postgresql-fulltext-search] PostgreSQL fulltext search, version 3.

PHPBB3-9730
[feature/postgresql-fulltext-search] Removed closing php tag in fulltext_postgres.php.

PHPBB3-9730
[feature/postgresql-fulltext-search] Fixed braces in fulltext_postgres.php to comply with phpbb conventions.

PHPBB3-9730
[feature/postgresql-fulltext-search] minor changes

Some changes in code to get it work against current develop.
PosgreSQL Fulltext search works for new install now.

PHPBB3-9730
[feature/postgresql-fulltext-search] database changes in database_update

config entries are now added by database_update.php as well.
PostgreSQL will work during update too.

PHPBB3-9730
observers
merge
Bug in video search: date filtering code used to warn - now crashes.
"Applied fix from trunk for revision: 1345547  " 
------------------------------------------------------------------------
r1345547 | jleroux | 2012-06-02 20:47:41 +0200 (sam., 02 juin 2012) | 8 lines

A patch from Nandani Aggarwal "Upload file throws java.lang.ClassCastException: java.nio.HeapByteBuffer" https://issues.apache.org/jira/browse/OFBIZ-4919

While creating Promo under catalog in Admin , we create Promo Code so that party or Email can be attached to Promo and also there we can set expiry date for that Promo.While uploading list of Email Ids for which Promo will be applicable,,i encountered with error : java.lang.ClassCasrrException:java.nio.HeapByteBuffer.
Error can be reproduced by following link :
https://localhost:8443/catalog/control/createBulkProductPromoCodeEmail?productPromoCodeId="Name of : Product Promo Code Id"
Or with help of attached screenshot.


------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release11.04@1345550 13f79535-47bb-0310-9956-ffa450edef68
added mail.php file, and some new functionalities
using more up-to-date copyright format spec
removed debian/watch

I have a native package at this point, so I'll make new tags ONLY when a new
packaged release is cut. If this ever changes, a watch file will be re-added
updated package description
Force manpage to go into section '1' NOT '1p'
filtering for all the easy ones (aka all except driving and transit)
minor onclick update
Password reset
I cannot spell
Switched from identity_id to session_token
Refactored and added spec for session token
Clear the reset token after it is used
Ignore all temporary files created by Emacs.
Listing 3.1.
Added a comment to check the AppHarbor deployment for the Shindy-Dev branch.
One last attempt before reverting
fixed recipe_book
Add about and contacts
Add comments counter
Ability to hide title
Update public blog structure
Change feed name
More styling: subtitle and coderay
Add introduction to rails timezones post
Xorshift init and running Random Spheres Test
config.active_record.whitelist_attributes = true
attr_accessible, :only_path => true on redirects that need it
(Bug 4449) Minor change to profile tooltip, use LJ::strip_html to remove spurious HTML in title text.
Changed the admissions embed code.
Fixed a stupid bug introduced by removing the anonymity stuff.
Merge resolved.
Add multicore bringup on x86 baremetal

All cores get brought up now as we do on ulnx. There is still a bug
with respect to cache invalidation that has to be fixed
removed maya from mkproject
Fixed the way menu options are called, Added begin of Report for RAM
Continued building the reacções medicamentosas form
Removed Headers on Links page, Added addresses to the vigil page, removed the horarions + contactos link from the footer
make $mysql_password have valid syntax although omitted
Updated to use ruby 1.9 and rake 0.9.2.2 - can start now with 'rake server
position.clj
adding zbar
adding required frameworks
idkianad
Static HTTP server can now serve gargantuan files
no need to look at the gen folder
changed toast stay time to 4500
fixed typo
removing useless jquery references
Site updated at 2012-06-20 16:32:56 UTC
- Added libraries necessary to make Loif's tests run (and to make Loif compile).
- Added LICENSES.txt to lay out the licenses used by said libraries. This was the condition of Mockito, so I did it for Emma as well.
Addition shell scripts.
Fixed login
Merge branch 'master' of https://github.com/eXist-db/dashboard
README added. sorry. last commit just deleted an irrelavant text file; and
i didn't start tracking the README file since it was a new file.
Changed repositories to RW default. Adding patch task
Added timers, tcr.cgi now uses transportation-only
Adds correct padding byte
Keepalive cron script
Edit Gemfile grouping sqlite3
Movement actions have their own file.
Started a state machine Behavior class.
adding person, cleaning company up a little
Move .cache to caching module.
updated defoult values in settings
merge zoom
marker corection
fix for moving marker codition and some warnings
Add File.open/2
Add File.close/1
Use File.open and File.close
Merge pull request #338 from elixir-lang/file_open

Add File.open and File.close
gitig updated
Correctly buttonizing paths with leading spaces in DBG buffers

Just adjusting a regexp.
Racket: fix for module compilation for recent rackets

This one probably requires Racket 5.3, and incorporates some
parameterization to the module compilation and evaluation code in
Geiser's version of enter.rkt.  I'm mostly mirroring what the latter
does, and i'm probably not completely understanding all corner cases,
so the two users of Geiser should keep an eye open for possible
breakage introduced by this patch.
(ioccur-case-fold-search): Provide smart case-fold-search in ioccur.
(ioccur-print-results): Fix setting of case-fold-search.
Unapprove posts buttom from SeleePy's  Post Unapproval mod

Signed-off-by: emanuele <emanuele45@gmail.com>
Show the unapprove button only if post moderation is on and show 'unapprove' instead of 'approve'

Signed-off-by: emanuele <emanuele45@gmail.com>
fixed runscript
typo fix
CGI fixes for windows
fix bug in theme choice
More README tweakage; bump gemspec version
added connection to wordlist.txt rather than exam
Adds carbonbox theme based on bira.

This is an adapation of bira with changes from
my personal bash theme.
Added README file for the bootstrap folder for basic usage of the scripts.
Merge pull request #1 from ahamilton55/master

Added in a README file for the bootstrap folder
some updates to collection
Fixed a bug in directory picker.
Fourth attempt :(
readme update with requirements
fixed display of MODS records
UI-2047 [PLF 4] Social - Activity - Wiki
fix tmux conf. Normal redraw screen and create some aliases.
Fix in memory object state handler fixture to be in line with legacy
Fixed: namespace in phpdoc
Updated: doc for throwing InvalidArgumentException
Updated: refactored updateContent(), added generating Content names from name schema, publishing URL aliases in publishVersion()

- removed unused class imports
- removed newFieldTypeValue()
- added checking for location parent in createContent()
- CS
Fixed: removed deprecated test, added missing test for updateContent(), fixed parent locations in content creation, removed unused import
Added: NameSchemaService getter, fixed: phpdoc description
Fixed: quoting asterisk as column
Fixed: typo spaces in array keys
Implmented: NameSchema service
REST: Add missing Accept-Patch headers
Fixed: Solr test for subtree based search.
Fix IO\LegacyHandler Fatal Error introduced in 147c3c88 by JV
Add RelationList SPI integration test
MDL-30081 complete unit tests and webform
removed test build.
Adapt to GlueGen IO resource changes URL -> URLConnection for effeciency
TennisES2 Update (textures)
Merge branch 'master' of github.com:sgothel/jogl-demos
TennisES2 Update
Finished MAS in Research
Merge branch 'reports' of https://github.com/farhanrahman/kyoto into reports
Merge pull request #14 from fbarthelery/master

Move the detection of android sdk from build.xml to build.bash
Remove unused patch for beem
gitfetch : Do not prefix branch with "origin/"

This allow to use the -b option changeset ids or branch/tag from other remote
repository
Simplify test names
Rename bytesAvailable -> bytesAhead
Specifiy escaping behavior for NaN / Infinity
Specify escaping behavior for NaN / Infinity
Refactor: Extract _validateEnqueue method
Support `fields` argument and events

For advanced use cases.
CLOSE - task : Mark in the calendar the weight of the user in the month
selected
CLOSE - task : Update the weight information in main window
fix syntax error for allowing likes
clarified HPCBIOS_2011-92

Signed-off-by: Fotis Georgatos <fotis.georgatos@uni.lu>
Added packages.json for package_control
SuiteRunListener wasn't used
Bumping the version to 0.1.3
FIX NullPointer on search projects for no results
Merge pull request #40 from geosdi/shared-projects

FIX NullPointer on search projects for no results
Merge remote-tracking branch 'upstream/master'
Fixed the articleprovider with dummyData
弹出窗口不能关闭的问题，其实是层级错了。
Merge branch 'master' of https://github.com/florolf/vaporlight
Added docs to Readme
Move it to Readme.md for markup to kick in on github
io: fix build break

* Fix a build break on GCC
* Add some optional but useful dependencies
* Remove a no-op install
mercurial 2.2.3

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

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

- Make commands for gcc and llvm-gcc version agnostic
- Do not hardcode the path of gcc and llvm-gcc
- Added '-nomain' parameter to add your own main routine, for more advanced uses (eg. adding classes)

Closes #13483.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
runcocoa: use sha1
snappy: add --universal option

Closes #13473.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
jasper: source location update

sukkology.net isn't hosting the source anymore. uvic.ca is the
maintainer.

Closes #13461.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
jasper: use sha1
New formula: genstats

Closes #13455.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
git-extras 1.7.0 (includes bash completions)

Closes #13436.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
libinfinity: add `depends_on :x11`

libinfinity-0.5.2 requires a dependency on :x11 so that pkg-config
can find freetype2 for cairo.   Otherwise two libinfinity libraries
will not be created, which will cause other packages that use
libinfinity to fail, like gobby.
Tested on Lion with llvm from XCode-4.3.3.

Closes #13416.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
libinfinity: use sha1
libdc1394 2.2.0

Upgrade libdc1394 to version 2.2.0.
Add a dep on x11 so that it links against XQuartz if present.
Disable the examples and sdltest.  They cause build errors trying
to find OpenGl.
Move the `def patches` block to before `def install`.
Tested on Lion with clang and llvm from XCode-4.3.3.

Closes #13406.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
libcsv 3.0.2 & use configure

Upgrade libcsv to version 3.0.2.
Add code to use `configure` and make to build this.
Remove code that sets env vars on the `make` command line because
`configure` establishes the correct values.
Tested on Lion with clang and llvm from XCode-4.3.3 by getting
libcsv to pass make check (~.25sec).

Closes #13404.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
pkg-config 0.27

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
glib 2.32.4

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
libglademm: add `depends_on :x11`

libglademm will fail to compile in HB-0.9.2 unless is has a new
dep on :x11 to help it find its components. Add a `depends_on :x11`
Tested on Lion with clang and llvm from XCode-4.3.3.

Closes #13469.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
rename www to kwarque
Subiendo todo los archivos a la nube github
Changed the model.
Changed the model.
Added a color attribute to the player.
Possibility to render a nexus.
plot wip
aaaa

1st graph okay
wip: 2nd, 3rd
Soften the wording.
Finished creating unit tests for the MonologAdapter
Initial directory structure.
initial import
add externals to Ext, OpenLayers, GeoExt, and GeoExt.ux
add svn:ignore into root dir
add svn:ignore into the apache dir
add svn:ignore into buildout dir
add svn:ignore into public/build dir
add svn:ignore into tilecache dir
add svn:ignore into mapserver dir
add svn:ignore into print dir
added tiles controller
added SQL tiles generator
fixed a typo
(a) modified model so that it works with a view instead of a table (b) commented out useless printpanel (c) styleMap for tiles vector layer (d) combobox in order to select tag (e) remotecontrol plugin enabled (f) refresh strategy (g) bmo and ortholittorale layers added (h) minor fix in generate_tiles.py
added refresh link, which triggers a call to tiles.refresh()
fixed evg.recipe.activate to version 0.3 due to a bug in version 0.4
(a) wsgi configured (b) logs dir commited (c) js build OK (d) added js config file
(a) fixed missing config.js (b) point measurement srs = epsg:4326
added raster tiles layer
popup arrow now OK on non debug mode
Added Welcome
Compass IE Support
Beanstalk
Beanstalk
Added layout elements
Added the "http://" to the link so it would trigger properly in markdown
more prettifying the email that user sees
Fixed bug, cleaned up
The serial verison works now.
Clojure Plugin
coffee-script plugin
Remove history file from saved image
deje el codigo un poco mas objetoso
improve select draw
Tweaked a couple of the expectation tests.
Now normalization multipliers are constructed simultaneously with expectation.
Fixed .gitignore

(I had accidentally used cat instead of echo to
add the name of a program file.)
Performed another contraction analysis.
Wrote and tested first draft of optimization code.
Cosmetic:  stripped out some empty lines.
Cosmetic: Fixed the fold comment for NDArrayData.newZeros
Implemented bandwidth increase for NDArrayData and wrote simple test.
[sci-libs/fox] make it prefix aware

(Portage version: 2.2.0_alpha110/git/Linux x86_64, unsigned Manifest commit)
updated ChangeLog
Merge branch 'master' into booksdb
formatting cleanup
formatting cleanup
Merge branch 'master' into booksdb
[JobQueue] Fixed misuse of array type cast.

Change-Id: I5d5f4325827cfb5fc5d0b85f57595541340a08d5
Revert "Show a "(blocked)" hint on Special:ListUsers/ActiveUsers"

This reverts commit 341552f6618be866571de5e0f1a6c78038bb856a
Merge "Revert "Show a "(blocked)" hint on Special:ListUsers/ActiveUsers""
Follow-up I186669a5 (4b62b03): reorder hooks alphabetically

Change-Id: I399f10df254762c4dd05e2c6fb83c29cc6121f81
(bug 40829) Show cascading protection info on action=info

Change-Id: Ibc26bf8ae4e50bb9f158f48747b648df3ecb4b49
Update notes for submitted changes

* Add additional specs + Parsoid-centric tests to keep Parsoid in line.
fixed python executable location
better configuration layout, language strings updated
ie8 styles for doc-modal
Added version and closed beta event
Converted visual studio project into eclipse CDT project
Fix spec/dummy app
Refactor SocialStream::Object#collection

[ci skip]
Ignore sphinx files
Remove coffee dependency
Temporary fix for events#index
Use sphinx in object search
Questions to moderators
environment creation script added
Email my mentees. Fix bug 751135.
Add user authentication to shopping Cart
v2.0

fullly operative with automactically acquiring mac address.
v2.0
Time to unfuck .tmux/
Simplify pattern matching ast
Allow multiple statements on one line
Photos in attachments
키 바인딩 설정, 일부 작업 중...
did stuff, then reverted
Deleted PYCs
Merge branch 'master' of https://github.com/gpallis/mtgotrader
Login system - note that profile is broken
Prints out each waiter's tips after loop
* Moved 4 procedures for basic reading/writing TObjSection contents into ogcoff.pas, so they don't have to be reimplemented for every output format.

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@21492 3ad0048d-3df7-0310-abae-a5850022a9f2
* GetCPUCount implementation for OS/2 added

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@23233 3ad0048d-3df7-0310-abae-a5850022a9f2
update to datastore 1.0.8
Merge branch '2.1.x' of github.com:grails/grails-core into 2.1.x
GRAILS-9560 changed to not shut down a DataSource that uses JNDI
first push
add gitignore
Pause by SPACEBAR and Fullscreen by DoubleClick
Merge pull request #28 from meighti/e732fd93d00d08bf6b6139b09c10f8738eedd8e9

Pause by SPACEBAR and Fullscreen by DoubleClick
fix triangle angle properties
quote  and  and use noextract option
libunwind and compiler-rt now reside inside of libc
report IDENTICAL operators as unsupported
fixed GROOVY-5408: JavaAwareCompilationUnit should have a constructor that allows to set transformLoader
Merge pull request #41 from pniederw/GROOVY-5408

fixed GROOVY-5408: JavaAwareCompilationUnit should have a constructor th...
Update products/skyrocket.mk
#8 Agregando iconos en pagina de socios
#19 Bug de socio inexistente
Add git settings (including gitignore) and a bit of tuning to emacs.
Add the leiningen profile.
Add code to set date parameter to one year if user searches for top 10. Also modified radius for bounding box for better search results...
[Update] Bug fix of deleteApplicant and LowerCase
began fixing the renderable/camera thing

next steps: give IRenderable some metadata
cameras are now renderables
Fixed errors in ANTLR grammar
Facelift yall
Face lift merge
message et train
Find should return nil entry is not found in a map

Previously it was returning a truthy [k nil] MapEntry. Test are
included to ensure correct behaviour
Support assoc on maps as well as assocN
Port replace, with tests
Move over reductions with tests.
Use more robust test that is not implementation-dependent
Merge pull request #138 from lfranchi/porting

Port two small functions + supporting changes over, plus tests.
Added test file and added the main with reading file funtion
updated the funtion of the main
Merge branch 'master' of github.com:hall9/Weighted-BST
Add 'I want to play Resistance' and 'I want to play double spy'
neues Uebungsblatt
更新数据及文档
Merge branch 'development' of https://github.com/hao3039032/Symagic.git into development
this is how you can center a div block
this is how you center a div
i
ii
only tease strangers not members
i
github-updates-like comments
Fixed bug in function __safe_show_first_line_and_truncate for files without newline
File pattern is now also required for searching with option --use-git
Removed useless use of null character in function __safe_grep_in_files
Merge branch 'master' of https://github.com/panada/Panada
simplified version of method objectToArray and arrayToObject in Tools class
Fix throw error

get last error from pg_last_error function
Merge remote-tracking branch 'upstream/master'
Merge pull request #51 from de3/master

critical update throw error pgsql
Modified Rest class to make header request more flexible
Merge branch 'master' of https://github.com/panada/Panada
Merge remote-tracking branch 'officialsource/master'
Fix new content node view.
Fragments don't have an author.
Enclosed favicon in a block to make it customizable.
Merge pull request #6 from anandology/favicon

Enclosed favicon in a block to make it customizable.
Redo the work from yesterday to place an add to playlist form on video page
Auth on http request
Dodano sieć FeedForward
controller: Move public key related stuff to its own class
windows: Add SparkleShare to startup items
[mac] move images from Pixmaps to Resources

Change the build action from Content to
BundleResource.
[mac] use NSImage.ImageNamed for retina support

Avoid using the full path to images and instead
allow NSImage.ImageNamed to pick the right image
from the main bundle. On Retina displays this
means NSImage will pick an @2x named image if it
exists.
[mac] SparkleSetup: support @2x images

Since the plugin images come from a manifest
with full paths, to support @2x images we have
to do a little more work by rebuilding the image
path based on NSWindow.BackingScaleFactor.

Theoretically this is forward compatible with
future scalings (e.g. @3x, @9000x).
[mac] SparkleSetup: use NSImage.ImageNamed for tutorial-slide images
[mac] add retina tutorial-slide-3
[SparkleLib] fix debug build
Merge pull request #1095 from abock/master

Add Retina Support
fix product price scale
ExchangeRatesBundle added
add :C to clear current search pattern
redo statusline and add :C to clear search pattern
classe Lex
ARM: use generic strnlen_user and strncpy_from_user
 functions

This patch implements the word-at-a-time interface for ARM using the
same algorithm as x86. Although we have a clz instruction from ARMv5,
this only saves us one mov instruction when building with Thumb-2 and
makes no difference when targetting ARM, so we use the magic 0x0ff0001
constant for all CPUs. For big-endian configurations, we use the
implementation from asm-generic.

With this implemented, we can replace our byte-at-a-time strnlen_user
and strncpy_from_user functions with the optimised generic versions.

Signed-off-by: Will Deacon <will.deacon@arm.com>
modified for Linux 3.0 from Linux 3.4+ by faux123

Conflicts:

	lib/strnlen_user.c
tempative refactoring for fs run/project/sample management
Fix a nasty bug in inputunit
* Write input unit to avoid that bug from appearing again
* Do some progress in debugging some issues with DNSClient
Refactor captive portal test to run tests in threads
Add OAuth2 token authentication to GitHub API client

(using the net.wagstrom.research.github.token config option)
support mingw64
Small modification of index.html file
New command-t version
remove any warnings from the build
remove old code from rrdtool from monitor-gen
实现了两级不同的地图以及地图的平移。
By tianchaos
2012.10.26
Octopress init
Site updated at 2012-10-27 05:21:31 UTC
.v[ariables] print Praspel representations.
extra for powershell
Added memory allocation failure tests
size_t is 8, int is 4 on amd64
Changed from int to size_t in some places
Removed warning about missing initalization of base class in copy constructor. I hope it is corect now?
Add my previous bash theme
Merge branch 'master' of ssh://github.com/horazont/oh-my-zsh
StateDevice -> Refactor constructor arguments to allow for initial_state parameter
Insteon: Fix regression bug.
Light -> Flush out some more functionality for Lights.  Working on interaction with Location object.
Update api_doc.txt and change case in wtdio and w800rf32 interfaces
forever now installs globally
coffeescript追加｡移行coffeeで書く.
change handlebars from beta to rc
dom ready #fix bug for opera
#fix opera bug. disable dcss
9.19 morning 1
Merge branch 'master3' of https://github.com/hoyoji/HoYoJiMoney.git into master3
Merge branch 'master3' of https://github.com/hoyoji/HoYoJiMoney.git into master3
9.19 afternoon
Merge branch 'master3' of https://github.com/hoyoji/HoYoJiMoney.git into master3
9.20 morning
11.23
projectSharedToTo
Merge branch 'master6' of https://github.com/hoyoji/HoYoJiMoney.git into master6
11.23
projectSharedToTo
Merge branch 'master6' of https://github.com/hoyoji/HoYoJiMoney.git into master6
Merge branch 'master6' of https://github.com/hoyoji/HoYoJiMoney.git into master6
11.26
projectSharedToAddNew
Merge branch 'master6' of https://github.com/hoyoji/HoYoJiMoney.git into master6
fixed bug:

projectpreexpensebalance 
projectpreincomebalance
fixed bug:

projectpreexpensebalance 
projectpreincomebalance
Merge branch 'master5' of https://github.com/hoyoji/HoYoJiMoney.git into master5
Merge branch 'master5' of https://github.com/hoyoji/HoYoJiMoney.git into master5
fixed bug:
account summary
Movie rating exercises (core).
Reports: New directory host for reports layouts.
edit load.rb
added some javadoc to densematrix
Añadida la escala a la habilidad de disparar
Cambiando la manera de eliminar actores, ahora tienen un flag "_vivo" que indica si tienen que seguir en la escena.
Bugfix: CamelCase for names with leading __
fix #2
Update docs and code for cleaning log files
Merge branch 'clean_logfile'
Add ability to list queued resources in initial message
Add listing on first message, status on updates, and counts on final message
Added exome_pipeline and modified nosetests for my account
exome_pipeline.py based on old bcbb code: now reworking with refactored code
sample delivery and exome_pipeline

- added sample delivery from bcbio
- added test for running exome_pipeline
Changed data delivery: delivery from barcode directory of course
Major changes

Major improvement is make_lane_items, which makes the items necessary for bcbio downstream analysis from process_alignment
sample delivery working

* massive changes to sample_delivery.py
* test_sample_delivery.py takes care of three most important cases
* added functions for conversion between barcode formats
* added get_flowcell_id to get flowcell information from a non_flowcell directory (that could contain barcode directories or fastq files)
* added indices to all lanes in run_info.yaml
* refactored test_samplebased_analysis - removed sample delivery code
Added setup_project_files.py

Relinks delivered files to original flowcell directories in intermediate analysis directory

* More barcode conversion in fastq.py
* More general globbing
* Added docs to exome_pipeline.py
* Major changes to setup_project_files.py
Removed obsolete functions and corrected error in test_project_setup
exome pipeline working

- tests now work in the sense that after sample delivery and project setup mapping works
- removed sample.py
- removed merge.py
Added template loc-files
Fixed tests to read right config file
Moved scilife python files to bcbb
Added scilife LaTeX files
first commit
Added script for counting barcode sequences
Updated README
Added assisted_delivery.py
Updated README
Added dry run switch instead of interactive mode
Added manual specification of sample names for non-demultiplexed runs
Add the used access token to the `UserResponseInterface`
update
Merge branch 'master' of github.com:hyperfunk/dotfiles
add problem 19-22
Add Contact page
Add a full_title helper
Finish layout and routes
Finish layout and routes
Finish layout and routes
Modifying oauth1 rfc5849's utils to wrap stdlib functions in encode/decode rather than reimplementing them.
Adding back 'safe' chars for escaping.
new modules - pages, category; many updates
Ignore .DS_Store files
Merge pull request #7 from oxyrox/master

.DS_Store files ignored
Few test added
Tests:
- loadLayout();
- loadCss();
- loadJs();
- loadMenu();
- testCssFileExists()
tests
Implemented first-cut of singleton xBoilerplate, modifying both the index.php and the tests to call it correctly.
test.css
Merge branch 'master' of https://github.com/otupman/xBoilerplate
Merge pull request #9 from otupman/master

First cut of Issue-8: convert xBoilerplate to a singleton
testCssFileExists() Incoplete
testLoadLayout() with all files
Merge pull request #11 from djuric42/master

New tests
Merge pull request #12 from centralway/master

Base changes
Fixed some tests that were suing the non-singleton xBoilerplate. Fixed the Singleton xBoilerplate loadPageCss, loadPageJs methods. Added a missing tests for loadPageCss and loadPageJS.
Merge pull request #13 from jjperezaguinaga/fix-xBoilerplate

Fixed xBoilerplate and added some tests. 
Added an extra unit test that shows that ajax calls are made twice per load due the templating system.
Solved issue #11 by modifying the template to echo directly the page content if config->raw.
Adding build.xml and sonar-project.properties to add xBoilerplate to the QM process
Adjusted build.xml to allow local build
Fixed the example application files so that they work correctly.
Criação do Factory DAO

Este factory, é responsável por criar os daos que serão utilizados no
projeto
Alteração

Foi alterado a chamada do DAO, para que seja chamado através da factory
DAO
Explicitly cast sockets to int when setting $clients array
Fix README example
Add @covers annotations for Server::createConnection
refactoring the cookie store.
updated project build settings for Xcode 4.4.1
--
merged changes from work
python-mode
Changed font-size to 10pt
boss new new
pot file updated.
Make the CustomerUserModelBackend Dj1.5 compatible
Merge branch 'no-initial-data' into django-1.5
Merge pull request #8 from incuna/django-1.5

Make the CustomerUserModelBackend Dj1.5 compatible
Add the right guice-servlet
More WIP commits for the asset bundle refactoring
Release 1.0.0.085
Restore pom.xml for development
integration of cob_base_velocity_smoother, moved here from cob_navigation
Merge pull request #16 from ipa-frm/master

renamed cob_vel_integrator to cob_base_velocity_filter and moved it to cob_driver
release 0.4.7
hoists URL encoding POST body generation out as a function
Buttons: generic loading indictator
Amend the last faulty commit
Merge branch 'hotfix/0.9.0.2'
First Commit of Memory Game
Commiting all files in lpthw directory
Merge branch 'master' of https://github.com/itpaul/Memory-Game
Added Ex39.py
可删除自己贴的纸条
Merge pull request #10 from iuliux/master

Fixed skipped Float
Jump paths.
Mostly finished rearranging the main loop in such a manner to make sample-accurate MIDI feasible
Even more improved asthetics, despite my crappy graphic design skills...
Now redirects to a confirmation page and clears the shopping cart.
README updated
- adjusted swiping parameters
Merge branch 'prog_week' of github.com:jack-kerouac/RoomR into prog_week
captialized variable names for Backbone model/view/collection instances
added recommended body element to index,html
Merge branch 'prog_week' of github.com:jack-kerouac/RoomR into prog_week

Conflicts:
	public/workshop/src/script/main.coffee
map for the search results
added RoomrSection
Merge branch 'prog_week' of github.com:jack-kerouac/RoomR into prog_week
Trap and clean up in pre-commit hook

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Sample DB snapshot.
[Terminator] Changes font to Source Code Pro.
[Git] Sets `meld` as difftool.
[Vim] Updates color schemes.
[Vim] Sets to off autocomplete's preview.
Merge branch 'master' of github.com:jairtrejo/dotfiles

Conflicts:
	vim/colors/jellybeans.vim
added the omblog templates
Always animate opacity.  animateShow flag now controls slide in animation.  Added demo/test page.
Merge branch 'master' into gh-pages
Added licensing information
Updated plot_fundamentals.py example
update GPXObject
update a test code
Check the uploader class before instantiation (see #4086)
jokerin weightit fixattu
Add license info
Added thread worker namespace protection
Add more examples to the README. Closes #43.
StackExchange authentication

Can't test locally.
Get user details

Can't debug locally
기존에 서비스하고 있던 slipp 버전과 통합함.
DataExporter jar파일 추가
Update the way we extract parameter values. Regex we were using has been updated to something a bit more clean and more accurate. It now properly ignores comments inside parameter lists.
Add some more details to README.
Add loop edges metadata.
Update leetcode/Java/longestParentheses.java
added bookmark lister
wesley page edits
Add methods to pass in TypeToken instances for deserialization, and remove teh post-processor stuff that keeps messing up things
removed autogenerated Makefile
imporovements on the topnav style
Merge branch 'master' of github.com:woodybrood/fitnesse
Merge branch 'master' of git://github.com/unclebob/fitnesse
More authy goodness.
Continued development of ASCCOnverter interface; implemented +/- buttons
add multi_replace for mysql adapter as mysql supports it
Double speed of Model#new with empty hash, and quadruple speed of Model#set with empty hash

This just does a fast exit in the case that the hash is empty.
Model#initialize_set is supposed to be called for all new model
objects, so that couldn't be skipped.  This does call Hash#empty?
twice in the new? case, but if the hash is empty, the earlier check
makes it about 20% faster, and if the hash is not empty, there's
the extra call does not cause a significant slowdown.
Update CHANGELOG and fix RDoc for multi_replace commit
real laplace correction
rapache 1.1.20 / apache2-mpm-itk
Created util.h, added some function prototypes.
Implemented the functions in util.c, as prototyped in util.h.
My solarized theme to work with 256 colors in both OS X Lion terminal + MacVim.
moving stuff around
added window autoresize function
iblah
Upgrade to mocha 1.5.0
Remove jeweler configuration from Rakefile, add bundler/gem_tasks
Improved readability in xhr.serialize()
Added documentation and merged __toString() into __typeof()
Change the default TcpTransport setting for failfast so that it doesn't actually 'fail fast.'
Last update was incorrect. This will change the default TcpTransport setting for failfast so that it doesn't actually 'fail fast.'
2nd commit
Updated README.md
added additional links to projects
Add per-instance DOM addition of modal; regex for parsing email address
Moves the pg config to the bundle job.
Translate Windows paths into Unix paths when compiling with IAR.

We assume that the compilation is done on a Windows machine but the code
is edited under Unix.
expand the express test
fix app.locals with express <2.5.11
Provide the start of an EQC model for a degenerate queue.
Capture all possible transition states currently possible.
Document current state.
Update the model with tokens fully.
Enable EQC test for real runs.
Add a helper which can hopefully be used to check fixpoints in the code.
Introduce some weights to fix distribution.
Allow for a way to poll the queue.
Work on getting sv_queue to start/stop.
More weight tuning.
Use EQC to fix a bug when repoll'ing on undefined hz.
this version was submitted as a preliminary draft
Main class to run application, not finished.
Build jar with no dependencies.
Trying unsuccessfully to integrate JGRC
Fix bitwidth issus
Add .gitignore to list of files not to symlink
Gem install defaults to not installing ri or RDoc
Bump jnr-enxio dep to 0.3
changed to use foreman with port 5000
updating yamjs location
added new bash aliases
fixed your bad destroy link
Merge branch 'joh' of github.com:johdirr/SlideCloud into joh
医疗UI提交

Signed-off-by: johnnyeven_work2 <loverjohnny@126.com>
minor tweaks to text post
fixed based on Michael Hunger's input
Split whole chord and Moved util stuff
Transform chords so bass can handle them:D
Basic baseline works with only one element
criando pastas dos models para refatoração dos locales
criando pastas das views e renomeando as models para comecar refatoracao dos locales
Update autologin
Translation: Norwegian language. Removed utf8 prefix as this is no longer required. Includes changes made in r1697.

git-svn-id: http://corsix-th.googlecode.com/svn/trunk@1701 c39591fa-788f-11de-a72b-d90af8dea425
Thanks pete!
chmod play
Implements DELETE methods for objects
完成button
项目管理
Move sources from base into src subfolder.
Add Models from qrtm to remember.
Port application from qrtm to rtm.
ArcMap workstation
Relates to #29, one more edit
Added the correct gutter spacing
Add memory map mirrors for the TIA, RIOT and RAM
Fix Rakefile
Add new Rails versions to index & 404 HTML files
updated vim plugins
Merge branch 'master' into tmux
vimrc change to toggle set paste
Merge branch 'master' into tmux
- add apache conf
Completed print all, watchlist and ex-watchlist methods
Fixes #13: Mimeheaders are now encoded by default. Requires mbstring functions.

Signed-off-by: Frank de Jonge <info@frenky.net>
Set the right mimeencoding when quoted-printable encoded.

Signed-off-by: Frank de Jonge <info@frenky.net>
Alt body is will never be html.

Signed-off-by: Frank de Jonge <info@frenky.net>
SMTP doesn't need Bcc headers.

Signed-off-by: Frank de Jonge <info@frenky.net>
Fixed incorrect trimming of cid
Merge pull request #28 from floorish/cid-bug

Fixed incorrect trimming of cid
Merge branch 'refs/heads/1.2/master' into 1.1/develop
Update numbers.py
updated
Fix initial-state calculation and create errors protocol specification listing
Check word processing according to protocol specification
Use Rakefile instead of bin
fixed titlepic links
user manage page and a few small style fixes
tried to fix the /daguerreo/ link problem in as many places as I could.  Still need to test internal fn redirects
Added the display information, and fixed the bug that I had before.
Needo to make it more robust, it breaks if you blow on it.
Changed someone to Matt
Added a Config class

Also fixed possible race condition in specs
Starting to parse XBee packets.
Added generic graph objects
Update rake task to get stories from 7 pages.
Update LIVESC/res/values/arrays.xml
More stab for parsing casexml from commcare
Merge branch 'master' of github.com:katembu/identifier
fix bug
modified on Sunday 12 Aug 2012
modified on 8 Oct 2012
add some view samples
Remove sending EOS sot that chunked response does not contain multiple 0\r\n
handle headers
whoa, why did I just do != ? should be <
name and value contain buffers, which I just now realized. just snip the required parts
allow user to ignore arbitrary headers
remove stupid debug stuff
properly merge new options
only go into loop if this is a non-HEAD request
finished adding parent pom. server constructor
renamed README
changed README
fixed readme details
implementation of the /users/:uid/closed route
fixed a bug where it does not post to all servers
first commit of kevbook
working layered boosting
changed .files to just file for simplicity sake
adjusting postion of hands
test
	trunk/application-build-desktop/main.o
mise à jour du 24/05/2012 à 21h47
mise à jour du 21/05/2012 à 11h19
Merge branch 'master' of github.com:kirby49/stage_2012
Update launcher to daemonize
Merge pull request #3 from keedi/feature/start-with-mojo

Update launcher to daemonize
ordonner + début du retrait de la priorité => position
centralisation de l'affichage Panel + Clean UP
centraliser spinner
remplacer la priorité par la position
added partage par mail
new layout
tsp.cc: added global variables, added methods and descriptions
settings: Add default config file
font fix osx
Kevin - pre merge commit
sed is most unko tool ever
modify find book logic.
minor reformatting
refactored layout.scss
simplify varargs to always have an explicit last parameter called varrp
beginning of SDL_GL_GetProcAddress
strip debug info in -O1 and above by default, unless -g is specified when converting to JS, since (1) js optimizations strip it anyhow, and (2) it slows down compilation
addition getProcAddress functions
revert eliminator change due to breakage
fix struct.pollfd
save the canvas in preloadedImages, and do canvas blits in IMG_Load etc.
updated the default in the case statement
Added about page with minimal information
server parameter for EU
Added iSDK requirement to header
Added option to reverse upload order
changed json format to work with mongoimport. script to import interests to mongo
ukadroid: 描画サイズの取得対応やイベント実装など
UI is done (MS#1) with test code
Keep COM port preference as a char array
add JGroups block API test code
Merge branch 'master' of github.com:kylinsoong/TankWar
[maven-release-plugin] prepare release jasocket-0.5.0
new file:   README
new project
Add/Remove Nodejs Nature
fix pyclient url
Modified to print using Webduino server instance
altera o nome da classe DadosFisioterapeuta para Login
Updated druntime - fixes issue #101.
Always cache libconfig++ flags; tell user if pkg-config could not be found.

Previously, it was not clear to the user if pkg-config detection failed, leading to surprises if libconfig++ actually was present on the system.

The LIBCONFIG* variables are now always cached so that they can conveniently be set from ccmake/cmake-gui.
Use hand-written .di files if present along the source – fixes issue #95.
Fix #77 - LDC1 fails to compile tango.io.vfs.ZipFolder.

I think the same rewrite for contract this should be valid in D1 - if I missed something crucial, feel free to revert.
Merge branch 'master' into llvm-3.1
Correctly define D_PIC version identifier when relocation model is PIC.
Added root to collect static files to
Renamed environment vars
Changelog:
Updated the the UpdatePosition function to work through the new modular
design in the platform. Needs testing.

Rebuilt UpdatePosition function for the 'input to rectangle' test functionality.
Changed the null check for blitting text to screen.
Can move into testing to verify old functionality retained during file split.

CHANGE. Into a buttface.
Removed the references to blahder from thysio.h
Added some comments to renderer.c
Added a stub to allow removal of a global UpdatePosition context
Add Ext Login Form
buggy decompression
Change version
Merge branch 'release/0.10.1' into develop
Adding autocomplete to Local
ticket:5 Form fields have been arranged in two columns.
Add explicit error logs
Finished modeling applications and filling applications from excel upload
The initial plugin structure
Allow other directory names than cmake to be used.
Remove default created shape
Changed background settings layout
Зміна 3
Fixed Bug: ghost block was drawn to screen as '##' instead of '  ' (in Mac OS X)
define version of m2e plugin as 1.0.0
enlarge range of gmaven-plugin to be ignored by eclipse
Change emplace for vector and deque to create the temporary (when necessary) before any changes to the container are made.  Nikolay Ivchenkov deserves the credit for pushing this problem and the solution for it.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@159918 91177308-0d34-0410-b5e6-96231b3b80d8
Allow libc++ to be built with CMake from within the LLVM tree. The libc++ part is just some renaming as the variable  was already in use, conflicting with something else in the LLVM tree.  Contributed by Ruben Van Boxem.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@153036 91177308-0d34-0410-b5e6-96231b3b80d8
Refactor Logger reporter
documenting nan parameter
Updated documentation for pointer arguments.
user now can create/modify alignments
added reaction description field
Split tools into separate coffeescript files.
Ignoring DS_Store files.
Revised static pages with contact page
More CSS update
Improve style of grid selector
Add merged script
Implemented the rest of the viewport policies.
Created Input and InputComponent.

And some minor fixes.
Added the custom content manager.
Implemented camera zoom. Yes, just this one commit.
Started on the particle system.
Converted expense association from user to invite
Fixed expenses remaining
Styling and completed posts
Luke: Update COPYING
mark as read rework almost done, some smaller features
unindent style.css
marking as read; with undo
better inmoredetail styling, use own version for django-userena
Trivial ghc-7.6 update

http://stackoverflow.com/questions/12560619/bits-is-not-derived-from-num
Merge pull request #3 from michaelt/patch-1

Trivial ghc-7.6 update
Added test naming conventions document.
Test initial presence encoding to XML.
Renamed Message to XML encoder files.
nested docs are suppied as SID collections in SID fields. XMLLoader support. tests refresh
LOLAP -- zipper test coverage success
trying to preload the videos
Merge branch 'master' of github.com:m4tty/video-royale
Added the login and create user dialogs.
Signed-off-by: mayingkui <maeikei@gmail.com>
style
wip fixes
wip fixes
added lightdm upstart script replacement
Added working configs for the frankencake and Prusa
Added symlink for Prusa Configs
removing test file
fixing global vars
init project
first version of gallery
[trunk] merge from branch 1.5 a correction about large code-block data (decoding part) and add tests about issue 5 and issue 62

git-svn-id: http://openjpeg.googlecode.com/svn/trunk@2266 974d547c-b4cf-11dd-89c7-03d08fec6209
existing test cases all working with new token techniques
broke a test case, but seems like a good place to check in
removed label conditioning for images other than Ti-26
remove NaNs from the fmeasure
updated and will soon be refactored into a more general framework
new watershed evaluation for intensity images
revised job scripts

- no longer need to copy files around--just directly read from ground
folder
- source an appropriate seq?.sh folder for specific customizations
commit final del demo
Cambio en el ControllerResolver para obtener el view, template y cache...

Ahora los obtiene llamando a los métodos protegidos:

getView(), getTemplate y getCache().

Para mantener la encapsulación en el controlador.
se renombra la clase CacheKernel a AppCache
added link regex flag. got repeat/no repeate working
增加对宽度的判断‘
Add details to readme about Mapnik versions supported
Update README.md

- added lodash possible usage instead of underscore
página de sobre da aplicação (wip)
link para a pagina de sobre
Merge branch 'master' of github.com:marcoshack/feirasp
Add local compression helper
Start new z-stacking context in mover div

Prevents styled backgrounds from hiding the selection
Prevent vertical gaps from showing up in selection marker
Move matchBrackets out of the core

Add CodeMirror.defineOption function for defining new options.

Add findMatchingBracket to the methods exported by this extension.

Closes #746
Added vim/janus, adjusted osx defaults.
vim stuff
Created a Core domain layer and some raven indexes